diff -Nru texlive-lang-2018.20180725/debian/changelog texlive-lang-2018.20180824/debian/changelog --- texlive-lang-2018.20180725/debian/changelog 2018-07-25 05:41:42.000000000 +0000 +++ texlive-lang-2018.20180824/debian/changelog 2018-08-24 02:11:45.000000000 +0000 @@ -1,3 +1,10 @@ +texlive-lang (2018.20180824-1) unstable; urgency=medium + + * new upstream checkout + * change Perl shebangs + + -- Norbert Preining Fri, 24 Aug 2018 11:11:45 +0900 + texlive-lang (2018.20180725-1) unstable; urgency=medium * new upstream checkout diff -Nru texlive-lang-2018.20180725/debian/control texlive-lang-2018.20180824/debian/control --- texlive-lang-2018.20180725/debian/control 2018-07-25 05:41:42.000000000 +0000 +++ texlive-lang-2018.20180824/debian/control 2018-08-24 02:11:45.000000000 +0000 @@ -262,15 +262,17 @@ . platexcheat -- A LaTeX cheat sheet, in Japanese . + plautopatch -- Automated patches for pLaTeX/upLaTeX + . ptex -- A TeX system for publishing in Japanese . ptex-base -- Plain TeX format and documents for pTeX and e-pTeX . - ptex-fonts -- Fonts for use with pTeX - . ptex-fontmaps -- Font maps and configuration tools for Japanese/Chinese/Korean fonts with (u)ptex . + ptex-fonts -- Fonts for use with pTeX + . ptex2pdf -- Convert Japanese TeX documents to PDF . pxbase -- Tools for use with (u)pLaTeX diff -Nru texlive-lang-2018.20180725/debian/Licenses.packages texlive-lang-2018.20180824/debian/Licenses.packages --- texlive-lang-2018.20180725/debian/Licenses.packages 2018-07-25 05:41:42.000000000 +0000 +++ texlive-lang-2018.20180824/debian/Licenses.packages 2018-08-24 02:11:45.000000000 +0000 @@ -1043,6 +1043,7 @@ texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-mr.tex texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-or.tex texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pa.tex +texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-ta.tex texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-te.tex texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-as.tex @@ -1054,6 +1055,7 @@ texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-mr.tex texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-or.tex texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pa.tex +texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-ta.tex texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-te.tex texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-as.chr.txt @@ -1092,6 +1094,10 @@ texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pa.hyp.txt texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pa.lic.txt texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pa.pat.txt +texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt +texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.hyp.txt +texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt +texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-ta.chr.txt texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-ta.hyp.txt texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-ta.lic.txt @@ -1785,6 +1791,9 @@ platex.i386-linux: platexcheat: mit texmf-dist/doc/latex/platexcheat/* +plautopatch: bsd3 +texmf-dist/doc/latex/plautopatch/* +texmf-dist/tex/latex/plautopatch/* polski: lppl1.2 texmf-dist/doc/latex/polski/* texmf-dist/source/latex/polski/* diff -Nru texlive-lang-2018.20180725/debian/rules texlive-lang-2018.20180824/debian/rules --- texlive-lang-2018.20180725/debian/rules 2018-07-25 05:41:42.000000000 +0000 +++ texlive-lang-2018.20180824/debian/rules 2018-08-24 02:11:45.000000000 +0000 @@ -41,6 +41,7 @@ for i in $(PACKAGES) $(METAPACKAGES) ; do \ bash debian/generate-license-file $$i ; \ bash debian/fix-privacy-breach $$i ; \ + bash debian/useless-fix-perl-shebang-for-policy $$i ; \ find debian/$i/usr/share -name \*.jar -exec chmod ugo-x '{}' \; ; \ if [ -r debian/$$i.links.dist ] ; then cat debian/$$i.links.dist >> debian/$$i.links ; fi ; \ done diff -Nru texlive-lang-2018.20180725/debian/tpm2deb.cfg texlive-lang-2018.20180824/debian/tpm2deb.cfg --- texlive-lang-2018.20180725/debian/tpm2deb.cfg 2018-07-25 03:59:48.000000000 +0000 +++ texlive-lang-2018.20180824/debian/tpm2deb.cfg 2018-08-22 04:34:49.000000000 +0000 @@ -66,7 +66,7 @@ # # Various kinds of dependencies # -depends;texlive-base;ucf, libpaper-utils +depends;texlive-base;ucf, libpaper-utils, sensible-utils # get some suggestions for gs/pdf viewer suggests;texlive-base;ghostscript, gv | postscript-viewer, xpdf-reader | pdf-viewer recommends;texlive-pictures;ruby | ruby-interpreter, tk diff -Nru texlive-lang-2018.20180725/debian/useless-fix-perl-shebang-for-policy texlive-lang-2018.20180824/debian/useless-fix-perl-shebang-for-policy --- texlive-lang-2018.20180725/debian/useless-fix-perl-shebang-for-policy 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/debian/useless-fix-perl-shebang-for-policy 2018-08-22 02:44:04.000000000 +0000 @@ -0,0 +1,85 @@ +# +# useless-fix-perl-shebang-for-policy +# (c) 2018 Norbert Preining +# +# try to fix the *very* helpful lintian error about perl shebang +# not being #!/usr/bin/perl ... +# + +pkg="$1" + +allfiles=" +usr/share/texlive/texmf-dist/scripts/oberdiek/pdfatfi.pl +usr/share/texlive/texmf-dist/scripts/fig4latex/fig4latex +usr/share/texlive/texmf-dist/scripts/mkpic/mkpic +usr/share/texlive/texmf-dist/scripts/texdoctk/texdoctk.pl +usr/share/texlive/texmf-dist/scripts/texlive/fmtutil.pl +usr/share/texlive/texmf-dist/scripts/texlive/mktexlsr.pl +usr/share/texlive/texmf-dist/scripts/texlive/tlmgr.pl +usr/share/texlive/texmf-dist/scripts/texlive/tlmgrgui.pl +usr/share/texlive/texmf-dist/scripts/texlive/uninstall-win32.pl +usr/share/texlive/texmf-dist/scripts/texlive/updmap.pl +usr/share/texlive/tlpkg/TeXLive/trans.pl +usr/share/texlive/texmf-dist/scripts/rubik/rubikrotation.pl +usr/share/texlive/texmf-dist/scripts/authorindex/authorindex +usr/share/texlive/texmf-dist/scripts/flowfram/flowfram.perl +usr/share/texlive/texmf-dist/scripts/glossaries/makeglossaries +usr/share/texlive/texmf-dist/scripts/pax/pdfannotextractor.pl +usr/share/texlive/texmf-dist/scripts/perltex/perltex.pl +usr/share/texlive/texmf-dist/scripts/dosepsbin/dosepsbin.pl +usr/share/texlive/texmf-dist/scripts/epstopdf/epstopdf.pl +usr/share/texlive/texmf-dist/scripts/fontools/afm2afm +usr/share/texlive/texmf-dist/scripts/fontools/autoinst +usr/share/texlive/texmf-dist/scripts/fontools/ot2kpx +usr/share/texlive/texmf-dist/scripts/bundledoc/arlatex +usr/share/texlive/texmf-dist/scripts/bundledoc/bundledoc +usr/share/texlive/texmf-dist/scripts/ctanify/ctanify +usr/share/texlive/texmf-dist/scripts/dviinfox/dviinfox.pl +usr/share/texlive/texmf-dist/scripts/latex-git-log/latex-git-log +usr/share/texlive/texmf-dist/scripts/latex2man/latex2man +usr/share/texlive/texmf-dist/scripts/latexindent/latexindent.pl +usr/share/texlive/texmf-dist/scripts/ltximg/ltximg.pl +usr/share/texlive/texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl +usr/share/texlive/texmf-dist/scripts/pdfcrop/pdfcrop.pl +usr/share/texlive/texmf-dist/scripts/pkfix-helper/pkfix-helper +usr/share/texlive/texmf-dist/scripts/srcredact/srcredact.pl +usr/share/texlive/texmf-dist/scripts/sty2dtx/sty2dtx.pl +usr/share/texlive/texmf-dist/scripts/texcount/texcount.pl +usr/share/texlive/texmf-dist/scripts/texdef/texdef.pl +usr/share/texlive/texmf-dist/scripts/texdiff/texdiff +usr/share/texlive/texmf-dist/scripts/texdirflatten/texdirflatten +usr/share/texlive/texmf-dist/scripts/texfot/texfot.pl +usr/share/texlive/texmf-dist/scripts/texlive/e2pall.pl +usr/share/texlive/texmf-dist/scripts/texloganalyser/texloganalyser +usr/share/texlive/texmf-dist/scripts/pedigree-perl/pedigree.pl +usr/share/texlive/texmf-dist/scripts/tex4ht/mk4ht.pl +usr/share/texlive/texmf-dist/scripts/jmlr/makejmlrbook +usr/share/texlive/texmf-dist/scripts/crossrefware/bbl2bib.pl +usr/share/texlive/texmf-dist/scripts/crossrefware/bibdoiadd.pl +usr/share/texlive/texmf-dist/scripts/crossrefware/bibmradd.pl +usr/share/texlive/texmf-dist/scripts/crossrefware/biburl2doi.pl +usr/share/texlive/texmf-dist/scripts/crossrefware/bibzbladd.pl +usr/share/texlive/texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl +usr/share/texlive/texmf-dist/scripts/ptex-fontmaps/kanji-config-updmap.pl +usr/share/texlive/texmf-dist/scripts/ptex-fontmaps/kanji-fontmap-creator.pl +usr/share/texlive/texmf-dist/scripts/cjk-gs-integrate/cjk-gs-integrate.pl +usr/share/texlive/texmf-dist/scripts/jfmutil/jfmutil.pl +usr/share/texlive/texmf-dist/scripts/mkgrkindex/mkgrkindex +usr/share/texlive/texmf-dist/scripts/kotex-utils/jamo-normalize.pl +usr/share/texlive/texmf-dist/scripts/kotex-utils/komkindex.pl +usr/share/texlive/texmf-dist/scripts/kotex-utils/ttf2kotexfont.pl +" + +for f in $allfiles ; do + ff="debian/$pkg/$f" + if [ -r $ff ] ; then + echo "#!/usr/bin/perl" > $ff.new + echo "# Debian required shebang above" >> $ff.new + echo "# Original shebang below" >> $ff.new + echo -n "# " >> $ff.new + cat "$ff" >> $ff.new + mv $ff.new $ff + fi +done + + Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/bxjscls-manual.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/bxjscls-manual.tex 2018-08-23 21:57:31.000000000 +0000 @@ -12,8 +12,8 @@ \renewcommand*{\XeLaTeX}{XeLaTeX}} \usepackage{shortvrb} \MakeShortVerb{\|} -\newcommand{\PkgVersion}{v1.9a} -\newcommand{\PkgDate}{2018/07/20} +\newcommand{\PkgVersion}{v1.9b} +\newcommand{\PkgDate}{2018/08/20} \newcommand{\Pkg}[1]{\textsf{#1}} \newcommand{\Meta}[1]{$\langle$\mbox{}\nobr#1\nobr\mbox{}$\rangle$} \newcommand{\Note}{\par\noindent ※} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/bxjscls.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/bxjscls.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/README-ja.md texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/README-ja.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/README-ja.md 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/README-ja.md 2018-08-23 21:57:31.000000000 +0000 @@ -98,6 +98,8 @@ 更新履歴 -------- + * Version 1.9b 〈2018/08/20〉 + - バグ修正。 * Version 1.9a 〈2018/07/20〉 - jsclasses の 2018/06/23 と同期。 + `\jsTocLine` を新設。 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/README.md texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/bxjscls/README.md 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/bxjscls/README.md 2018-08-23 21:57:31.000000000 +0000 @@ -88,6 +88,7 @@ Revision History ---------------- + * Version 1.9b 〈2018/08/20〉 * Version 1.9a 〈2018/07/20〉 - Sync with jsclasses 2018/06/23. * Version 1.9 〈2018/04/19〉 Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow-ja.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow-ja.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow-ja.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow-ja.tex 2018-05-17 20:25:12.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow-ja.tex 2018-08-21 21:52:16.000000000 +0000 @@ -430,9 +430,11 @@ （\verb+\settombowbanner+, \verb+\settombowbannerfont+, \verb+\settombowwidth+の各命令） - \item 2018/03/16 v0.9g \textsf{gentombow}に\textsf{pxgentombow}を統合、 + \item 2018/05/17 v0.9g \textsf{gentombow}に\textsf{pxgentombow}を統合、 \verb+pdfbox+オプションの追加、 \verb+\settombowbleed+, \verb+\settombowcolor+の追加 + \item 2018/08/20 v0.9h 用紙サイズ検出に\texttt{hagaki}を追加、 + \textsf{pdfpages}対策の改良 \end{itemize} \end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/gentombow.tex 2018-05-17 20:25:12.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/gentombow.tex 2018-08-21 21:52:16.000000000 +0000 @@ -287,6 +287,8 @@ \item 2018/05/17 v0.9g Add \verb+pdfbox+ option, \verb+\settombowbleed+ and \verb+\settombowcolor+. + \item 2018/08/20 v0.9h Add \texttt{hagaki} size for paper detection, + improve patches for \textsf{pdfpages}. \end{itemize} \end{document} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/README.md texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/gentombow/README.md 2018-05-17 20:25:12.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/gentombow/README.md 2018-08-21 21:52:16.000000000 +0000 @@ -44,6 +44,6 @@ ## Release Date -2018-05-17 +2018-08-20 Hironobu Yamashita diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq.html texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq.html --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq.html 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq.html 2018-08-16 20:48:00.000000000 +0000 @@ -1,181 +1,191 @@ - - - - - - jlreq - - - -
-

jlreq

-

What is this?

-

This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement Requirements for Japanese Text Layout.

-

Installation

-

Run make, then JFM files are created. Move the files as follows:

- -

make install will do this where $TEXMF=$TEXMFHOME

-

Usage

-

See README-ja.md (in Japanese).

-

LICENSE

-

This package is distributed under the BSD 2-Clause License. See LICENSE.

-

CHANGELOG

- -
-

Noriyuki Abe https://github.com/abenori/jlreq

-
- - + + + + + + jlreq + + + +
+

jlreq

+

What is this?

+

This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement Requirements for Japanese Text Layout.

+

Installation

+

Run make, then JFM files are created. Move the files as follows:

+ +

make install will do this where $TEXMF=$TEXMFHOME

+

Usage

+

See README-ja.md (in Japanese).

+

LICENSE

+

This package is distributed under the BSD 2-Clause License. See LICENSE.

+

CHANGELOG

+ +
+

Noriyuki Abe https://github.com/abenori/jlreq

+
+ + diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-ja.html texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-ja.html --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-ja.html 2018-08-16 20:48:00.000000000 +0000 @@ -1,472 +1,485 @@ - - - - - - jlreq - - - -
-

jlreq

-

これは何？

-

日本語組版処理の要件の実装を試みるLuaTeX-ja / pLaTeX / upLaTeX用のクラスファイルと，それに必要なJFMの組み合わせです．

-

提供されるもの

-

クラスファイルjlreq.clsと，横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています．また，縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります．

-

インストール

-

makeで必要なJFMを生成してください．その後，

- -

と配置します．make installとすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．

-

使い方

-

通常通り

-
\documentclass{jlreq}
-

とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションにplatex/uplatex/lualatexのいずれかを渡してください．縦書きにするにはtateオプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれreportやbookオプションを渡します．たとえば，縦書きの本を作成するには

-
\documentclass[tate,book]{jlreq}
-

とします．

-

その他，oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqnというよくあるオプションを受け付けます．

-

標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．

-

\jlreqsetup

-

設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか\jlreqsetupを通じて行うかします．どちらで設定するかは設定項目によります．

-

\section

-

\section*[running head]{見出し文字列}[副題]というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，\part（articleのみ），\chapter（book/reportのみ），\subsection，\subsubsectionも副題を受け付けます．

-

abstract環境

-

プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，\maketitleとともに出力されます．二段組の場合は，段組にならず概要を出力することができます．

-

\sidenote

-

この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って\sidenoteは定義されません．後の基本版面の設定を参考にしてください．

-

\sidenoteは傍注（縦組みの場合は脚注）を出力します．内部では\marginparを使っています．デフォルトでは\footnoteと同様の書式となりますが，\jlreqsetupでsidenote_type=symbolが指定されている場合，その書式は\sidenote{該当項目}{注}となります．たとえば

-
刊行できる\sidenote{原稿}{印刷などの方法により……}を入手する仕事である．
-

とします．後の説明も参照してください．

-

\endnote

-

後注を指定します．\footnoteと同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は\jlreqsetupにendnote_positionを渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また\theendnotesを実行するとその場に出力をします．

-

\warichu

-

割注を出力します．行分割位置などは自動で計算されます．（複数回のコンパイルが必要．）\warichu*ではこれらの位置を手動で指定できます．書式は

-
\warichu*{(一行目前) & (一行目後)\\ (二行目前) & (二行目後)...}
-
-

です．&が省略されている場合は自動で調整されます．

-

\tatechuyoko

-

縦中横を出力します．\tatechuyoko{<文字列>}とします．縦書きでない場所で使うとエラーになります．

-

\jafontsize

-

和文フォントサイズを指定する\fontsizeです．クラスオプションでjafontscale=0.9とされている場合，\fontsize{9pt}{15pt}とすると和文フォントのサイズは8.1ptとなりますが，\jafontsize{9pt}{15pt}とすると9ptとなります．（欧文フォントサイズは10ptとなる．）なお，第二引数は\fontsizeの第二引数と全く同じです．

-

\　

-

全角空白（U+3000）一文字からなるマクロです．和文間隔を挿入します．LuaLaTeXでは　のみでも和文間隔を入力できます．

-

その他

- -

各種設計

-

設計はクラスオプションまたは\jlreqsetupによりkeyval形式で行います．以下では次の用法を使います．

- -

基本版面

-

クラスオプションです．

- -

組み方

-

クラスオプションです．

- -

注関係

-

\jlreqsetupで指定します．

- -

キャプション

-

図表のキャプションを\jlreqsetupで変更できます．

- -

引用

-

quote / quotation / verse環境の挙動を\jlreqsetupで指定できます．

- -

箇条書き

-

\jlreqsetupで指定します．

- -

定理環境

-

\jlreqsetupで指定します．

- -

見出し

-

見出しの設定は，\Declare***Headingという命令で行います（***には見出しの種類に応じた文字列が入る）．書式はすべて

-
\Declare***Heading{<命令名>}{<レベル>}{<設定>}
-
-

となっています．また，\New***Heading，\Renew***Heading，\Provide***Headingも同時に用意されます．それぞれ

- -

となっています．

-

扉見出し

-

\DeclareTobiraHeadingで作成します．通常のクラスファイルにおける\section等と同じ書式の命令ができます．設定は以下の通り．

- -

別行見出し

-

\DeclareBlockHeadingで作成します．\<命令名>*[running head]{見出し文字列}[副題]という書式の命令を作成します．設定は以下の通り．

-

書式関連

- -

インデント関連

- -

その他

- -

行取り

-

行取りの指定は以下のいずれかの方法で行うことができます．

- -

連続して掲げる見出しの行取り

-

\SetBlockHeadingSpacesにより，見出しが連続して掲げられたときの行取りを設定することができます．\SetBlockHeadingSpacesは

-
\SetBlockHeadingSpaces{
-  {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}}
-  [lines=5]{_section,23pt,_subsection,16pt}
-}
-

のように使います．この意味は次の通りです．

- -

個々の設定は以下のようになります．

- -

なお，見出しが連続しているかは単純に別行見出しの命令が並んで書かれているかのみで判断します．従ってそれらの命令間に出力には関係しないような命令が挟まっていたとしても，見出しが連続して掲げられているとは判断されません．ただし，見出し命令の間に空白，改行または\label[<オプション>]{<引数>}…{<引数>}という形のもののみが挟まれている場合は，見出しが連続していると判断されます．

-

同行見出し

-

\DeclareRuninHeadingで作成します．通常の文書クラスにおける\sectionと同様の，\<命令名>*[running head]{見出し文字列}という書式の命令が作成されます．設定は以下の通り．

- -

窓見出し

-

\DeclareCutinHeadingで作成します．\<命令名>{見出し文字列}という書式の命令を作成します．設定は以下の通り．

- -

\ModifyHeading

-

既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば

-
\ModifyHeading{section}{lines=10}
-

とすると，\sectionのフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません．

-

\SaveHeading

-

見出し命令の定義を待避します．

-
\SaveHeading{section}{\restoresection} % \sectionの中身を\restoresectionに待避．
-\RenewBlockHeading{section}{1}{font=……} % \sectionを新しく定義する．
-……
-\restoresection % \sectionの中身を元に戻す．
-

のように使います．

-

ページスタイル

-
\DeclarePageStyle{<ページスタイル名>}{<設定>}
-
-

によりページスタイルを定義することができます．<設定>はkeyval形式です．定義したページスタイルは\pagestyleで適用できます．設定は以下の通り．

- -

\NewPageStyle，\RenewPageStyle，\ProvidePageStyleもあります．\ModifyPageStyleにより既存のページスタイルを改変することが可能です．

-

JFM

-

以下のような独自のJFMを使います．パッケージによっては，パッケージ独自のJFMや，また標準のJFMを使うように設定がし直される場合があります．例えばLuaTeX-jaに付属するluatexja-presetパッケージは通常LuaTeX-ja標準のJFMを使います．本クラスファイルで使っているJFMを使う場合は，

-
\usepackage[jfm_yoko=jlreq,jfm_tate=jlreqv,hiragino-pron]{luatexja-preset}
-

のようにオプションで指定する必要があります．

-

pLaTeX/upLaTeXの場合

-

JFMの名前は次の通りです．[]で囲まれている文字は設定により入ったり入らなかったりします．

-
[u][b][z]jlreq[g][-v]
-
-

それぞれの文字は以下の場合に入ります．

- -

例えば，ぶら下げ組みを利用せず，クラスオプションにopen_bracket_pos=zenkakunibu_nibuが指定されいてるソースをpLaTeXで処理した場合，横書き明朝体にはzjlreqという名前のJFMが使われます．

-

LuaLaTeXの場合

- -

となります．ゴシックも同じJFMを使います．

-

その他

- -

ライセンス

-

このパッケージは二条項BSDライセンスの元で配布されています．詳しくはLICENSEをご覧ください．

-

履歴

- -
-

Noriyuki Abe https://github.com/abenori/jlreq

-
- - + + + + + + jlreq + + + +
+

jlreq

+

これは何？

+

日本語組版処理の要件の実装を試みるLuaTeX-ja / pLaTeX / upLaTeX用のクラスファイルと，それに必要なJFMの組み合わせです．

+

提供されるもの

+

クラスファイルjlreq.clsと，横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています．また，縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります．

+

インストール

+

makeで必要なJFMを生成してください．その後，

+ +

と配置します．make installとすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います．

+

使い方

+

通常通り

+ +

とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションにplatex/uplatex/lualatexのいずれかを渡してください．縦書きにするにはtateオプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれreportやbookオプションを渡します．たとえば，縦書きの本を作成するには

+ +

とします．

+

その他，oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqnというよくあるオプションを受け付けます．

+

標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています．

+

\jlreqsetup

+

設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか\jlreqsetupを通じて行うかします．どちらで設定するかは設定項目によります．

+

\section

+

\section*[running head]{見出し文字列}[副題]というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，\part（articleのみ），\chapter（book/reportのみ），\subsection，\subsubsectionも副題を受け付けます．

+

abstract環境

+

プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，\maketitleとともに出力されます．二段組の場合は，段組にならず概要を出力することができます．

+

\sidenote

+

この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って\sidenoteは定義されません．後の基本版面の設定を参考にしてください．

+

\sidenoteは傍注（縦組みの場合は脚注）を出力します．内部では\marginparを使っています．デフォルトでは\footnoteと同様の書式となりますが，\jlreqsetupでsidenote_type=symbolが指定されている場合，その書式は\sidenote{該当項目}{注}となります．たとえば

+ +

とします．後の説明も参照してください．

+

\endnote

+

後注を指定します．\footnoteと同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は\jlreqsetupにendnote_positionを渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また\theendnotesを実行するとその場に出力をします．

+

\warichu

+

割注を出力します．行分割位置などは自動で計算されます．（複数回のコンパイルが必要．）\warichu*ではこれらの位置を手動で指定できます．書式は

+
\warichu*{(一行目前) & (一行目後)\\ (二行目前) & (二行目後)...}
+
+

です．&が省略されている場合は自動で調整されます．

+

\tatechuyoko

+

縦中横を出力します．\tatechuyoko{<文字列>}とします．縦書きでない場所で使うとエラーになります．

+

\jafontsize

+

和文フォントサイズを指定する\fontsizeです．クラスオプションでjafontscale=0.9とされている場合，\fontsize{9pt}{15pt}とすると和文フォントのサイズは8.1ptとなりますが，\jafontsize{9pt}{15pt}とすると9ptとなります．（欧文フォントサイズは10ptとなる．）なお，第二引数は\fontsizeの第二引数と全く同じです．

+

\　

+

全角空白（U+3000）一文字からなるマクロです．和文間隔を挿入します．LuaLaTeXでは　のみでも和文間隔を入力できます．

+

その他

+ +

各種設計

+

設計はクラスオプションまたは\jlreqsetupによりkeyval形式で行います．以下では次の用法を使います．

+ +

基本版面

+

クラスオプションです．

+ +

組み方

+

クラスオプションです．

+ +

注関係

+

\jlreqsetupで指定します．

+ +

キャプション

+

図表のキャプションを\jlreqsetupで変更できます．

+ +

引用

+

quote / quotation / verse環境の挙動を\jlreqsetupで指定できます．

+ +

箇条書き

+

\jlreqsetupで指定します．

+ +

定理環境

+

\jlreqsetupで指定します．

+ +

見出し

+

見出しの設定は，\Declare***Headingという命令で行います（***には見出しの種類に応じた文字列が入る）．書式はすべて

+
\Declare***Heading{<命令名>}{<レベル>}{<設定>}
+
+

となっています．また，\New***Heading，\Renew***Heading，\Provide***Headingも同時に用意されます．それぞれ

+ +

となっています．

+

扉見出し

+

\DeclareTobiraHeadingで作成します．通常のクラスファイルにおける\section等と同じ書式の命令ができます．設定は以下の通り．

+ +

別行見出し

+

\DeclareBlockHeadingで作成します．\<命令名>*[running head]{見出し文字列}[副題]という書式の命令を作成します．設定は以下の通り．

+

書式関連

+ +

インデント関連

+ +

その他

+ +

行取り

+

行取りの指定は以下のいずれかの方法で行うことができます．

+ +

連続して掲げる見出しの行取り

+

\SetBlockHeadingSpacesにより，見出しが連続して掲げられたときの行取りを設定することができます．\SetBlockHeadingSpacesは

+ +

のように使います．この意味は次の通りです．

+ +

個々の設定は以下のようになります．

+ +

なお，見出しが連続しているかは単純に別行見出しの命令が並んで書かれているかのみで判断します．従ってそれらの命令間に出力には関係しないような命令が挟まっていたとしても，見出しが連続して掲げられているとは判断されません．ただし，見出し命令の間に空白，改行または\label[<オプション>]{<引数>}…{<引数>}という形のもののみが挟まれている場合は，見出しが連続していると判断されます．

+

同行見出し

+

\DeclareRuninHeadingで作成します．通常の文書クラスにおける\sectionと同様の，\<命令名>*[running head]{見出し文字列}という書式の命令が作成されます．設定は以下の通り．

+ +

窓見出し

+

\DeclareCutinHeadingで作成します．\<命令名>{見出し文字列}という書式の命令を作成します．設定は以下の通り．

+ +

\ModifyHeading

+

既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば

+ +

とすると，\sectionのフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません．

+

\SaveHeading

+

見出し命令の定義を待避します．

+ +

のように使います．

+

ページスタイル

+
\DeclarePageStyle{<ページスタイル名>}{<設定>}
+
+

によりページスタイルを定義することができます．<設定>はkeyval形式です．定義したページスタイルは\pagestyleで適用できます．設定は以下の通り．

+ +

\NewPageStyle，\RenewPageStyle，\ProvidePageStyleもあります．\ModifyPageStyleにより既存のページスタイルを改変することが可能です．

+

JFM

+

以下のような独自のJFMを使います．パッケージによっては，パッケージ独自のJFMや，また標準のJFMを使うように設定がし直される場合があります．例えばLuaTeX-jaに付属するluatexja-presetパッケージは通常LuaTeX-ja標準のJFMを使います．本クラスファイルで使っているJFMを使う場合は，

+ +

のようにオプションで指定する必要があります．

+

pLaTeX/upLaTeXの場合

+

JFMの名前は次の通りです．[]で囲まれている文字は設定により入ったり入らなかったりします．

+
[u][b][z]jlreq[g][-v]
+
+

それぞれの文字は以下の場合に入ります．

+ +

例えば，ぶら下げ組みを利用せず，クラスオプションにopen_bracket_pos=zenkakunibu_nibuが指定されいてるソースをpLaTeXで処理した場合，横書き明朝体にはzjlreqという名前のJFMが使われます．

+

LuaLaTeXの場合

+ +

となります．ゴシックも同じJFMを使います．

+

その他

+ +

ライセンス

+

このパッケージは二条項BSDライセンスの元で配布されています．詳しくはLICENSEをご覧ください．

+

履歴

+ +
+

Noriyuki Abe https://github.com/abenori/jlreq

+
+ + diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.html 2018-08-08 21:05:58.000000000 +0000 @@ -62,8 +62,9 @@ +

Note that this package is independent from Requirements for Japanese Text Layout (JLReq). JLReq says nothing about trim marks.

Installation

Move jlreq-trimmarks.sty and jlre-helpers.sty to $TEXMF/tex/latex/jlreq.

How to use

@@ -71,7 +72,7 @@ 
\usepackage[dvipdfmx,platex]{jlreq-trimmarks}

Options

-

The following class options (keyval style) are available.

+

The following package options (keyval style) are available.

platex, uplatex, lulatex

Set the engine. If it is not specified, then the engine is

trimmarks_paper

-

Set the size of the paper including trim marks. There are two ways to specify it.

+

Set the size of the paper including trim marks.

+

landscape

+

Swap the width and the height. This swaps only the width and height which is specified with the option trimmarks_paper. For example, landscape,trimmarks_paper=+{2cm,1cm}, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped.

show

Specify the types of trim marks which the package outputs. It is specified with the comma separated list like show={trimmarks,banner,digital}. If no argument is given, everything will be showed.

Noriyuki Abe https://github.com/abenori/jlreq

diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.html 2018-08-08 21:05:58.000000000 +0000 @@ -64,6 +64,7 @@
  • 可能な場合には，TrimBox / BleedBoxを設定
  • 紙サイズの設定
    • +

    なお，本パッケージは日本語組版処理の要件 (JLReq)とは無縁です．JLReqにはトンボに関する記述はありません．

    インストール

    $TEXMF/tex/latex/jlreq内にjlreq-trimmarks.styとjlreq-helpers.styを配置してください．

    使い方

    @@ -71,7 +72,7 @@ 
    \usepackage[dvipdfmx,platex]{jlreq-trimmarks}

    オプション

    -

    以下のクラスオプションを受け付けます．keyval形式です．

    +

    以下のパッケージオプションを受け付けます．keyval形式です．

    platex, uplatex, lulatex

    エンジンの指定です．省略時は，

    trimmarks_paper

    -

    トンボ付きの紙サイズを指定します．trimmarks_paper=a4のように，a0--a10, b0--b10, c2--c8（BはJIS B列）を指定できる他，trimmarks_paper={<width>,<height>}と直接寸法を指定することも可能です．指定されなかった場合は，現在の紙サイズから縦横2インチ増えた値を採用します．

    +

    トンボ付きの紙サイズを指定します．

    + +

    landscape

    +

    紙のサイズの縦と横とを入れ替えます．ただし入れ替えるのはtrimmarks_paperで明示的に指定された値に限ります．例えばlandscape,trimmarks_paper=+{1cm,2cm}とすると，もともとの紙サイズ（これは入れ替わらない）の横幅が2cm増え，縦幅が1cm増えた紙サイズとなります．

    show

    何を出力するか指定します．show={trimmarks,banner,digital}のようにカンマ区切りのリストを与えます．引数を与えない場合は全て表示します．

    \jlreqtrimmarkssetup

    -

    クラスオプションで指定できない設定を行えます．keyval形式です．

    +

    パッケージオプションで指定できない設定を行えます．keyval形式です．

    show=banner時に出力される文字列．

    bleed_margin

    @@ -125,6 +135,11 @@ +
  • 2018-08-08 +

    • Noriyuki Abe https://github.com/abenori/jlreq

    diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks-ja.md 2018-08-08 21:05:58.000000000 +0000 @@ -7,6 +7,8 @@ * 可能な場合には，TrimBox / BleedBoxを設定 * 紙サイズの設定 +なお，本パッケージは[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/) (JLReq)とは無縁です．JLReqにはトンボに関する記述はありません． + ## インストール $TEXMF/tex/latex/jlreq内にjlreq-trimmarks.styとjlreq-helpers.styを配置してください． @@ -19,7 +21,7 @@ ```` ## オプション -以下のクラスオプションを受け付けます．keyval形式です． +以下のパッケージオプションを受け付けます．keyval形式です． ### `platex`, `uplatex`, `lulatex` エンジンの指定です．省略時は， @@ -36,7 +38,15 @@ * `platex`または`uplatex`利用時は`dvipdfmx`． ### `trimmarks_paper` -トンボ付きの紙サイズを指定します．`trimmarks_paper=a4`のように，`a0--a10`, `b0--b10`, `c2--c8`（BはJIS B列）を指定できる他，`trimmarks_paper={,}`と直接寸法を指定することも可能です．指定されなかった場合は，現在の紙サイズから縦横2インチ増えた値を採用します． +トンボ付きの紙サイズを指定します． +* `trimmarks_paper=a4`のように，`a0--a10`, `b0--b10`, `c2--c8`（BはJIS B列）を指定できる他，`trimmarks_paper={,}`と直接寸法を指定することができます． +* `a4+{1cm,2cm}`のように`<紙サイズ>+{<寸法横>,<寸法縦>}`とした場合は，指定された紙サイズから指定された寸法だけ増やした紙サイズを設定します． +* `a4+2cm`は`a4+{2cm,2cm}`と等価です． +* `+2cm`と紙サイズの部分を省略すると，現在の紙サイズを利用します． +* デフォルトは`+2in`です． + +### `landscape` +紙のサイズの縦と横とを入れ替えます．ただし入れ替えるのは`trimmarks_paper`で明示的に指定された値に限ります．例えば`landscape,trimmarks_paper=+{1cm,2cm}`とすると，もともとの紙サイズ（これは入れ替わらない）の横幅が2cm増え，縦幅が1cm増えた紙サイズとなります． ### `show` 何を出力するか指定します．`show={trimmarks,banner,digital}`のようにカンマ区切りのリストを与えます．引数を与えない場合は全て表示します． @@ -47,7 +57,7 @@ * `no`：何も表示しません． ## `\jlreqtrimmarkssetup` -クラスオプションで指定できない設定を行えます．keyval形式です． +パッケージオプションで指定できない設定を行えます．keyval形式です． ### `banner` `show=banner`時に出力される文字列． @@ -75,6 +85,9 @@ - 最初のバージョン * 2018-06-17 - バグ修正． +* 2018-08-08 + - `trimmarks_paper`を拡張． + - パッケージオプション`landscape`を追加． -------------- diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/jlreq-trimmarks.md 2018-08-08 21:05:58.000000000 +0000 @@ -5,7 +5,9 @@ * Output trim marks * Set TrimBox and BleedBox if possible. -* Set the size of paper.. +* Set the size of paper. + +Note that this package is independent from [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/) (JLReq). JLReq says nothing about trim marks. ## Installation Move jlreq-trimmarks.sty and jlre-helpers.sty to $TEXMF/tex/latex/jlreq. @@ -18,7 +20,7 @@ ```` ## Options -The following class options (keyval style) are available. +The following package options (keyval style) are available. ### `platex`, `uplatex`, `lulatex` Set the engine. If it is not specified, then the engine is @@ -33,10 +35,16 @@ * the driver is `dvipdmx` if the engine is `platex` or `uplatex` ### `trimmarks_paper` -Set the size of the paper including trim marks. There are two ways to specify it. +Set the size of the paper including trim marks. + +* `trimmarks_paper=`: specify via the paper type. for the paper type, you can use `a0--a10`, `b0--b10` and `c2--c8`. Note that `b0--b10` is `JIS B' (Japanese B-series variant). +* `trimmarks_paper={,height>}`: specify via the width and height. +* `trimmarks_paper=+{,}` (e.g. `trimmarks_paper=a4+{1cm,2cm}`): `` (resp. ``) is added to the width (resp. height) of the paper size specified by `` For ``, one can use `` or `{,}` as in the above. +* `trimmarks_paper=a4+2cm` is equivalent to `trimmarks_paper=a4+{2cm,2cm}`. +* If `` is empty (e.g. `trimmarks_paper=+2cm`), the current paper size (which is specified usually by the option for the document class) is used. -* `trimmarks_paper=`: for the paper type, you can use `a0--a10`, `b0--b10` and `c2--c8`. Note that `b0--b10` is `JIS B' (Japanese B-series variant). -* `trimmarks_paper={,height>}` +### `landscape` +Swap the width and the height. This swaps only the width and height which is specified with the option `trimmarks_paper`. For example, `landscape,trimmarks_paper=+{2cm,1cm}`, adds 1cm to the height and 2cm to the width. But the current paper size is not swapped. ### `show` Specify the types of trim marks which the package outputs. It is specified with the comma separated list like `show={trimmarks,banner,digital}`. If no argument is given, everything will be showed. @@ -50,7 +58,7 @@ Set the additional settings with the keyval style. ### `banner` -The things which the package outputs when `show=banner` is specified in the class option. +The things which the package outputs when `show=banner` is specified in the package option. ### `bleed_margin` Set the bleed margin. @@ -74,6 +82,9 @@ - First release. * 2018-06-17 - Fixed a bug. +* 2018-08-08 + - Extended `trimmarks_paper`. + - Added a package option `landscape`. -------------- diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/LICENSE texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/LICENSE --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/LICENSE 2018-05-19 23:27:52.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/LICENSE 2018-08-08 21:05:58.000000000 +0000 @@ -1,12 +1,12 @@ -(2-clause BSD license) -jlreq and jlreq-trimmarks -Copyright 2017-2018, Noriyuki Abe. -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - * 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. - -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. - +(2-clause BSD license) +jlreq and jlreq-trimmarks +Copyright 2017-2018, Noriyuki Abe. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * 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. + +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 -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/README-ja.md texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/README-ja.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/README-ja.md 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/README-ja.md 2018-08-16 20:48:00.000000000 +0000 @@ -1,392 +1,402 @@ -# jlreq - -## これは何？ -[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/)の実装を試みる[LuaTeX-ja](https://osdn.jp/projects/luatex-ja/wiki/FrontPage) / pLaTeX / upLaTeX用のクラスファイルと，それに必要なJFMの組み合わせです． - -## 提供されるもの -クラスファイルjlreq.clsと，横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています．また，縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります． - -## インストール -`make`で必要なJFMを生成してください．その後， - -* *.tfm -> $TEXMF/fonts/tfm/public/jlreq -* *.vf -> $TEXMF/fonts/vf/public/jlreq -* jfm-jlreq.lua jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq -* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq - -と配置します．`make install`とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います． - -## 使い方 -通常通り -```latex -\documentclass{jlreq} -``` -とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションに`platex/uplatex/lualatex`のいずれかを渡してください．縦書きにするには`tate`オプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれ`report`や`book`オプションを渡します．たとえば，縦書きの本を作成するには -```latex -\documentclass[tate,book]{jlreq} -``` -とします． - -その他，`oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn`というよくあるオプションを受け付けます． - -標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています． - -### `\jlreqsetup` -設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか`\jlreqsetup`を通じて行うかします．どちらで設定するかは設定項目によります． - -### `\section` -`\section*[running head]{見出し文字列}[副題]`というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，`\part`（articleのみ），`\chapter`（book/reportのみ），`\subsection`，`\subsubsection`も副題を受け付けます． - -### `abstract`環境 -プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，`\maketitle`とともに出力されます．二段組の場合は，段組にならず概要を出力することができます． - -### `\sidenote` -この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って`\sidenote`は定義されません．後の基本版面の設定を参考にしてください． - -`\sidenote`は傍注（縦組みの場合は脚注）を出力します．内部では`\marginpar`を使っています．デフォルトでは`\footnote`と同様の書式となりますが，`\jlreqsetup`で`sidenote_type=symbol`が指定されている場合，その書式は`\sidenote{該当項目}{注}`となります．たとえば -```latex -刊行できる\sidenote{原稿}{印刷などの方法により……}を入手する仕事である． -``` -とします．後の説明も参照してください． - - -### `\endnote` -後注を指定します．`\footnote`と同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は`\jlreqsetup`に`endnote_position`を渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また`\theendnotes`を実行するとその場に出力をします． - -### `\warichu` -割注を出力します．行分割位置などは自動で計算されます．（複数回のコンパイルが必要．）`\warichu*`ではこれらの位置を手動で指定できます．書式は -``` -\warichu*{(一行目前) & (一行目後)\\ (二行目前) & (二行目後)...} -``` -です．`&`が省略されている場合は自動で調整されます． - -### `\tatechuyoko` -縦中横を出力します．`\tatechuyoko{<文字列>}`とします．縦書きでない場所で使うとエラーになります． - -### `\jafontsize` -和文フォントサイズを指定する`\fontsize`です．クラスオプションで`jafontscale=0.9`とされている場合，`\fontsize{9pt}{15pt}`とすると和文フォントのサイズは`8.1pt`となりますが，`\jafontsize{9pt}{15pt}`とすると`9pt`となります．（欧文フォントサイズは`10pt`となる．）なお，第二引数は`\fontsize`の第二引数と全く同じです． - -### `\　` -全角空白（U+3000）一文字からなるマクロです．和文間隔を挿入します．LuaLaTeXでは`　`のみでも和文間隔を入力できます． - -### その他 -* ルビや圏点は提供されません．[PXrubrica](https://github.com/zr-tex8r/PXrubrica)または`luatexja-ruby`（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います． -* 日本語組版処理の要件2.3.2.dによれば，横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．`nidanfloat`パッケージを使い， - - ```latex - \usepackage[balance]{nidanfloat} - ``` - - とするとこの処理が行われます．ただし，最終ページでの`\newpage`や`\clearpage`が正しく動作しません．詳しくは`nidanfloat`パッケージのマニュアルをご覧ください． -* フォントを設定する機能は有していません．和文フォントは，LuaLaTeX利用時は`luatexja-fontspec`や`luatexja-preset`（いずれもLuaTeX-jaパッケージに付属）により設定することができます．dvipdfmxを使う場合は，[PXchfon](https://github.com/zr-tex8r/PXchfon)での設定が可能です． - - -## 各種設計 -設計はクラスオプションまたは`\jlreqsetup`によりkeyval形式で行います．以下では次の用法を使います． - -* `[A/B]`：AまたはBです．`[A/B/C]`等も同様． -* `<寸法>`：TeXが認識する寸法です．簡単な式（`10pt+10pt`のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）`\jlreqsetup`内のような場所では，常に`\zw`や`\zh`により全角幅が記述できます．以下，たとえば`Q`が利用可能な場合は`<寸法;Q>`のように記述します． - - `Q`：0.25mmと解釈されます． - - `zw`, `zh`：全角幅として解釈されます． - - -### 基本版面 -クラスオプションです． - -* `paper=[<紙サイズ名>/{<寸法>,<寸法>}]`：紙サイズです．紙サイズ名はa0からa10，b0からb10，c2からc8を指定できます．B列はJIS B列です．また，`{<横>,<縦>}`と直接寸法を指定することもできます． -* `fontsize=<寸法;Q>`：欧文フォントサイズ．デフォルトは10pt． -* `jafontsize=<寸法;Q>`：和文フォントサイズ． -* `jafontscale=<実数値>`：欧文フォントと和文フォントの比（和文 / 欧文）．`fontsize`と`jafontsize`が両方指定されている場合は無視される．デフォルトは1． -* `line_length=<寸法;zw,zh>`：一行の長さ．デフォルトは字送り方向の紙幅の0.75倍．実際の値は一文字の長さの整数倍になるように補正されます． -* `number_of_lines=<自然数値>`：一ページの行数．デフォルトは行送り方向の紙幅の0.75倍になるような値． -* `gutter=<寸法;zw,zh>`：のどの余白の大きさ． - - `tate`無指定時は奇数ページ左，偶数ページ右の余白 - - `tate`指定時は奇数ページ右，偶数ページ左の余白 - - `twoside`が指定されていない時は，常に奇数ページ扱いで余白が設定される -* `head_space=<寸法;zw,zh>`：天の空き量．デフォルトは中央寄せになるような値． -* `foot_space=<寸法;zw,zh>`：地の空き量．デフォルトは中央寄せになるような値． -* `baselineskip=<寸法;Q,zw,zh>`：行送り．デフォルトは`jafontsize`の1.7倍． -* `linegap=<寸法;Q,zw,zh>`：行間． -* `headfoot_sidemargin=<寸法;zw,zh>`：柱やノンブルの左右の空き． -* `column_gap=<寸法;zw,zh>`：段間（`twocolumn`指定時のみ）． -* `sidenote_length=<寸法;zw,zh>`：傍注の幅を指定します． - -### 組み方 -クラスオプションです． -* `open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]`：始め括弧が行頭に来た際の配置方法を指定します．それぞれ段落開始全角折り返し行頭天付き（デフォルト），段落開始全角二分折り返し行頭二分，段落開始二分折り返し行頭天付きを意味します． -* `hanging_punctuation`：ぶら下げ組をします． - -### 注関係 -`\jlreqsetup`で指定します． - -* `reference_mark=[inline/interlinear]`：合印の配置方法を指定します．`inline`にすると該当項目の後ろの行中に配置します．`interlinear`を指定すると該当項目の上（横組）または右（縦組）に配置します． -* `sidenote_type=[number/symbol]`：傍注と本文との対応の方法を指定します．`number`が規定で，注の位置に通し番号が入り，それにより対応が示されます．`symbol`とすると，注の位置に特定の記号が入り，また注がついている単語が強調されます． -* `sidenote_symbol=<記号>`：`sidenote_symbol=symbol`の時に，注の位置に入る記号．デフォルト＊ -* `sidenote_keyword_font=<命令>`：`sidenote_symbol=symbol`の時に，注のついている単語のフォント指定．デフォルトは無し（強調しない） -* `endnote_position=[headings/paragraph/{_<見出し名1>,_<見出し名2>,...}]`：後注の出力場所を指定します．`headings`は各見出しの直前（デフォルト），`paragraph`は改段落の際に出力します．また，`endnote_position={_chapter,_section}`とすると，`\chapter`と`\section`の直前に出力します． - -### キャプション -図表のキャプションを`\jlreqsetup`で変更できます． -* `caption_font=<命令>`：キャプション自身のフォントを指定します． -* `caption_label_font=<命令>`：キャプションのラベルのフォントを指定します． -* `caption_after_label_space=<寸法>`：ラベルとキャプションの間の空きを指定します． -* `caption_label_format=<書式>`：ラベルの書式を指定します．`caption_label_format={#1：}`のようにします．`#1`が「図1」のような番号に置換されます． -* `caption_align=[{left/right/center/bottom/top/<環境名1>=<位置指定1>,<環境名2>=<位置指定2>,...}]`：キャプションの場所を指定します．`caption_align=left`のように指定します．`caption_align={center,table=right}`とすると，`table`のみ右，そのほかは中央配置となります． - -### 引用 -`quote / quotation / verse`環境の挙動を`\jlreqsetup`で指定できます． -* `quote_indent=<寸法>`：字下げを指定します．デフォルトは2zwです．一行の長さが文字サイズの整数倍になるように調整されます． -* `quote_end_indent=<寸法>`：字上げを指定します．デフォルトは0zwです． -* `quote_beforeafter_space=<寸法>`：前後の空きを指定します．`quote_beforeafter_space=1\baselineskip`とすると一行あきます． -* `quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]`：フォントサイズを指定します． - -### 箇条書き -`\jlreqsetup`で指定します． -* `itemization_beforeafter_space=<寸法>`：箇条書きの前後の空きを指定します．`itemization_beforeafter_space={i=<寸法>}`とするとトップレベルのみに設定を行います．`itemization_beforeafter_space={0pt,i=10pt,ii=5pt}`とすれば，レベル1の箇条書きに10ptを，レベル2のそれに5ptを，それ以外には0ptを設定します．レベルは上記のように小文字ローマ数字で指定します． -* `itemization_itemsep=<寸法>`：項目同士の空きを指定します． - -### 定理環境 -`\jlreqsetup`で指定します． -* `theorem_beforeafter_space=<寸法>`：定理環境の前後の空きを指定します． - -## 見出し -見出しの設定は，`\Declare***Heading`という命令で行います（***には見出しの種類に応じた文字列が入る）．書式はすべて - -``` -\Declare***Heading{<命令名>}{<レベル>}{<設定>} -``` - -となっています．また，`\New***Heading`，`\Renew***Heading`，`\Provide***Heading`も同時に用意されます．それぞれ - -* `\New***Heading`：指定した名前の命令が既に定義されている場合はエラー． -* `\Renew***Heading`：指定した名前の命令が定義されていなければエラー． -* `\Provide***Heading`：指定した名前の命令が定義されていない場合に限り見出し命令の定義が行われる． - -となっています． - -### 扉見出し -`\DeclareTobiraHeading`で作成します．通常のクラスファイルにおける`\section`等と同じ書式の命令ができます．設定は以下の通り． - -* `type=[han/naka]`：`han`だと半扉見出しを，`naka`だと中扉見出しを作ります． -* `pagestyle=<ページスタイル>`：見出し箇所のページスタイルを指定します． -* `label_format=<書式>`：ラベルを出力する命令を指定します．たとえば`label_format={第\thechapter 章}`のように指定します． -* `format=<書式>`：実際に出力する書式を指定します．`format={\null\vfil {\Huge\bfseries #1#2}}`のようにします．`#1`はラベルに，`#2`は見出し文字列に置き換えられます． - -### 別行見出し -`\DeclareBlockHeading`で作成します．`\<命令名>*[running head]{見出し文字列}[副題]`という書式の命令を作成します．設定は以下の通り． - -#### 書式関連 -* `font=<命令>`：見出しのフォントを指定します． -* `subtitle_font=<命令>`：副題のフォントを指定します． -* `label_format=<命令>`：ラベルのフォーマットを指定します．`label_format={第\thechapter 章}`などのようにします． -* `subtitle_format=<命令>`：副題のフォーマットを指定します．`subtitle_format={「#1」}`のようにします．`#1`が副題自身になります． - -#### インデント関連 -* `align=[left/center/right]`：見出し位置の横方向の配置場所を指定します． -* `indent=<寸法>`：見出し全体の字下げ量を指定します． -* `end_indent=<寸法>`：見出し全体の字上げ量を指定します． -* `after_label_space=<寸法>`：ラベル後，見出し文字列までの空きを指定します． -* `second_heading_text_indent=[<寸法>/{<寸法>,<寸法>}]`：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，`second_heading_text_indent=*1\zw`のように先頭に`*`をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，`second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}`という指定をすると，ラベルの有無に応じて値を変更することができます．`<ラベルがある時>`の指定ではやはり`*`を使うことができます． -* `subtitle_indent=<寸法>`：副題のインデント量を指定します．見出し文字列の一行目を起点として指定します． - -#### その他 -* `subtitle_break=[true/false]`：見出し文字列と副題の間を改行するか指定します． -* `allowbreak_if_evenpage=[true/false]`：見出しが偶数ページにあった場合，その直後の改ページを許可します． -* `pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]`：見出し直前の改ページを指定します．それぞれ，改ページ，`\cleardoublepage`実行，改段，なりゆき，奇数ページ開始，偶数ページ開始，です． -* `afterindent=[true/false]`：見出し直後の段落の字下げを行うかを指定します． -* `column_spanning=[true/false]`： 段抜きの見出しにします．`pagebreak=nariyuki`または`pagebreak=clearcolumn`の時には無視されます． - -#### 行取り -行取りの指定は以下のいずれかの方法で行うことができます． - -* 行数を指定し，その中央に配置します．`lines=<自然数値>`により行数を指定します．`before_lines=<自然数値>`や`after_lines=<自然数値>`により，さらに前後に追加する行数を指定します．たとえば`lines=3,after_lines=1`とすれば，四行の中に配置され，前の空きよりも後ろの空きの方が一行分大きくなります．`before_lines`により指定された空きはページ頭には入りませんが，`before_lines=*1`というように`*`を先頭につけると常に入るようになります． -* 行数と，前後いずれかの空きを指定します．`lines=<自然数値>`により行数を，`before_space=<寸法>`または`after_space=<寸法>`のいずれかの指定によりそれぞれ前または後ろの空きを指定します． -* 前後の空きを指定します．`before_space=<寸法>`および`after_space=<寸法>`を指定します． - -#### 連続して掲げる見出しの行取り -``\SetBlockHeadingSpaces``により，見出しが連続して掲げられたときの行取りを設定することができます．``\SetBlockHeadingSpaces``は - -```latex -\SetBlockHeadingSpaces{ - {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} - [lines=5]{_section,23pt,_subsection,16pt} -} -``` - -のように使います．この意味は次の通りです． - -* `\part`，`\section`，`\subsection`という順番で見出しが掲げられていて，その前後が見出しでない場合は，`\part`は三行取り＋前に一行空き，`\section`と`\subsection`は二行取りとなります． -* `\section`，`\subsection`という順番で見出しが掲げられていて，その前後が見出しでない場合は，全体で五行取りとし，`\section`と`\subsection`との間に`23pt`の空き，`\subsection`の後に`16pt`の空きを入れます． - -個々の設定は以下のようになります． - -* 各々の``{}``内には``_<見出し命令名>``か``<寸法>``をカンマ区切りで並べます． -* 先頭に``[]``で囲まれた設定を追加できます．これは連続して掲げられた見出し全体への設定となります．``lines / before_lines / after_lines / before_space / after_space``が利用可能です．各々の意味は上述の行取り指定と同じです． -* 寸法はそのまま空き量を表します． -* ``_<見出し命令名>``の後に``{}``で囲まれた設定を追加することで，その見出しの空き量を設定します．設定しない場合は前後に空きが入りません． -* 見出しに対する``{}``で囲まれた設定内では，``lines / before_lines / after_lines / before_space / after_space``が利用可能です．各々の意味は上述の行取り指定と同じです． -* ``{}``で囲まれた部分を``*``のみにすると（例えば``_section{*}``とすると）単独で掲げた場合と同じ設定を使います． - -なお，見出しが連続しているかは単純に別行見出しの命令が並んで書かれているかのみで判断します．従ってそれらの命令間に出力には関係しないような命令が挟まっていたとしても，見出しが連続して掲げられているとは判断されません．ただし，見出し命令の間に空白，改行または`\label[<オプション>]{<引数>}…{<引数>}`という形のもののみが挟まれている場合は，見出しが連続していると判断されます． - -### 同行見出し -`\DeclareRuninHeading`で作成します．通常の文書クラスにおける`\section`と同様の，`\<命令名>*[running head]{見出し文字列}`という書式の命令が作成されます．設定は以下の通り． - -* `font=<命令>`：見出しのフォントを指定します． -* `indent=<寸法>` 見出し文字列全体の字下げ量を指定します． -* `after_label_space=<寸法>`：ラベル後，見出し文字列までの空きを指定します． -* `label_format=<命令>`：ラベルのフォーマットを指定します．`label_format={\theparagraph}`などのようにします． - -### 窓見出し -`\DeclareCutinHeading`で作成します．`\<命令名>{見出し文字列}`という書式の命令を作成します．設定は以下の通り． - -* `font=<命令>`：見出しのフォントを指定します． -* `indent=<寸法>`：見出し全体の字下げ量を指定します． -* `after_space=<寸法>`：見出しと本文との間の空きを指定します． -* `onelinemax=<寸法>`, `twolinemax=<寸法>`：見出し文字列の長さが`onelinemax`以下ならば一行で，`twolinemax`以下ならば二行で窓見出しを出力します．それ以上の場合は三行です．デフォルトはそれぞれ6文字，20文字の長さ． - -### `\ModifyHeading` -既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば -```latex -\ModifyHeading{section}{lines=10} -``` -とすると，`\section`のフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません． - -### `\SaveHeading` -見出し命令の定義を待避します． -```latex -\SaveHeading{section}{\restoresection} % \sectionの中身を\restoresectionに待避． -\RenewBlockHeading{section}{1}{font=……} % \sectionを新しく定義する． -…… -\restoresection % \sectionの中身を元に戻す． -``` -のように使います． - -## ページスタイル -``` -\DeclarePageStyle{<ページスタイル名>}{<設定>} -``` -によりページスタイルを定義することができます．`<設定>`はkeyval形式です．定義したページスタイルは`\pagestyle`で適用できます．設定は以下の通り． - -* `yoko`：横書きで上下に出力します．デフォルト． -* `tate`：縦書きで小口側に出力します． -* `font=<命令>`：柱とノンブルのフォントを指定します． -* `running_head_position`, `nombre_position`：柱とノンブルの位置を指定します．`yoko`か`tate`のどちらが指定されているかで挙動が変わります． - - `yoko`指定時：`top-left`のように指定できます．`top / bottom / center / left / right / gutter / fore_edge`が使えます．`gutter`はのど，`fore_edge`は小口です．`left`，`right`の指定は奇数ページに対するものです．`twoside`が指定されている場合，偶数ページはその逆になります． - - `tate`指定時：`<寸法>`が指定できます．`running_head_position`は柱の天からの下げ量を，`nombre_position`はノンブルの地からの上げ量を指定します． -* `nombre=<書式>`：出力するノンブルを指定します．デフォルトは`\thepage`． -* `odd_running_head=<書式>`，`even_running_head=<書式>`：それぞれ奇数ページ，偶数ページの柱を指定します．`_section`のように`_`から始まる名前を指定すると，対応する見出しを出力します．（`_section`だと現在の`\section`を出力する．） -* `mark_format={[odd=<書式>/even=<書式>/_<見出し命令名>=<書式>],...}`：見出しを柱に出力する際のフォーマットを指定します．`mark_format={_section={節\thesection：#1},_chapter={第\thechapter 章\quad #1}}`のように指定します．見出し命令名の代わりに`odd`や`even`も指定でき，それぞれ奇数ページ/偶数ページの柱の書式になります．`\pagestyle`実行時に`\sectionmark`等を定義することで実現しています． - - -`\NewPageStyle`，`\RenewPageStyle`，`\ProvidePageStyle`もあります．`\ModifyPageStyle`により既存のページスタイルを改変することが可能です． - -## JFM -以下のような独自のJFMを使います．パッケージによっては，パッケージ独自のJFMや，また標準のJFMを使うように設定がし直される場合があります．例えばLuaTeX-jaに付属するluatexja-presetパッケージは通常LuaTeX-ja標準のJFMを使います．本クラスファイルで使っているJFMを使う場合は， - -```LaTeX -\usepackage[jfm_yoko=jlreq,jfm_tate=jlreqv,hiragino-pron]{luatexja-preset} -``` - -のようにオプションで指定する必要があります． - -### pLaTeX/upLaTeXの場合 -JFMの名前は次の通りです．`[]`で囲まれている文字は設定により入ったり入らなかったりします． -``` -[u][b][z]jlreq[g][-v] -``` -それぞれの文字は以下の場合に入ります． - -* `u`: upLaTeX利用時 -* `b`: ぶら下げ組み利用時．（クラスオプションに`hanging_punctuation`が指定された時．） -* `z`: 行頭における開き括弧類の前の空きが，段落開始時が全角二分，折り返し時が二分の時．（クラスオプションに`open_bracket_pos=zenkakunibu_nibu`が指定された時．） -* `g`: ゴシック用フォント． -* `-v`: 縦書き用． - -例えば，ぶら下げ組みを利用せず，クラスオプションに`open_bracket_pos=zenkakunibu_nibu`が指定されいてるソースをpLaTeXで処理した場合，横書き明朝体には`zjlreq`という名前のJFMが使われます． - -### LuaLaTeXの場合 -* 横書き用のJFMは`jlreq` -* 縦書き用のJFMは`jlreqv` - -となります．ゴシックも同じJFMを使います． - - -## その他 -* クラスオプション`jlreq_notes`が渡されると，日本語組版処理の記述と矛盾する設定が行われた場合に通知がされます． - -## ライセンス -このパッケージは二条項BSDライセンスの元で配布されています．詳しくは[LICENSE](LICENSE)をご覧ください． - -## 履歴 -* 2017-02-08 - - 最初のバージョン． -* 2017-02-17 - - いくつかバグを修正． - - クラスオプション/`\jlreqsetup`にいくつかのキーを追加/変更． - - `abstract`環境を実装． - - パッケージを読み込んでいるだけのはやめた． -* 2017-03-14 - - いくつかバグを修正． - - 和文ファミリを欧文ファミリに従属させるようにした． - - `\DeclareBlockHeading`にオプションをたくさん追加． - - quote環境などを調整するオプションを追加． -* 2017-03-20 - - バグ修正． - - `\footnote / \sidenote / \endnote`の周りに必要ならば空白を挿入するようにした． -* 2017-04-04 - - バグ修正． - - `\DeclarePageStyle`に`tate`と`font`オプションを追加． -* 2017-04-29 - - バグ修正 - - `jafontsize`と`jafontscale`をクラスオプションに，また`\jafontsize`を追加． - - `\tatechuyoko`を追加． - - クラスオプション`jlreq_warnings`を`jlreq_notes`に変更． - - いくつかのクラスオプションを`\jlreqsetup`に移動． - - いくつかのオプションを`\jlreqsetup`に追加． - - クラスオプションの`paper={<縦>,<横>}`を`paper={<横>,<縦>}`に変更． -* 2017-06-11 - - `plext` / `lltjext`の読み込みを中止． - - `\DeclareBlockHeading`に`align`を追加．`indent=center`や`end_indent=center`を廃止． - - 一部の`\kcatcode` (upLaTeX時) を変更． -* 2017-08-13 - - `column_spanning`を`\DeclareBlockHeading`に追加． - - ページレイアウトにおける「本文の長さ」に傍注の長さを入れるようにした． - - 傍注の長さのデフォルトを0とした． - - 傍注の長さが0の時には`\sidenote`を定義しないようにした． - - 和文間隔を挿入する命令を追加． -* 2017-08-29 - - 縦書きでも著者名が横書きで出てしまうバグを修正． -* 2017-11-23 - - バグ修正 - - `\SetBlockHeadingSpaces`を追加． - - `\contentsname` と `\indexname`に入っていたスペースを削除． -* 2017-12-02 - - バグ修正 -* 2017-12-22 - - JFMを改善． - - 別行見出しの間の`\label`の検出方法を変更． - - `\theequation`，`\thefigure`，`\thetable`に章番号を追加． -* 2018-02-01 - - 縦書きの傍注は奇数ページにのみ出るようにした（改善の余地ありかも）． - - LuaTeX時に`\fnfixbottomtrue`を追加． - - キャプション関係のオプションを`\jlreqsetup`に追加． - - `itemization_beforeafter_space`を拡張． - - バグ修正． -* 2018-04-11 - - 縦書き二段組みの傍注を下段に出すようにした． - - `begin_widh_(odd|even)_page`を`\DeclareBlockHeading`に追加． - - `\labelenumi`らをjarticleなどにあわせた． - - `column_gap`クラスオプションを使うとコンパイルできなかったバグ修正． - - `mark_format`を`\DeclarePageStyle`に追加． -* 2018-05-19 - - 目次内のラベルの長さを今までよりも長くした． - - 一部のマクロをjlreq-helpers.styに分離した． - - バグ修正． -* 2018-06-17 - - シリーズbもゴシックにするようにした． - - バグ修正． - --------------- -Noriyuki Abe -https://github.com/abenori/jlreq +# jlreq + +## これは何？ +[日本語組版処理の要件](https://www.w3.org/TR/jlreq/ja/)の実装を試みる[LuaTeX-ja](https://osdn.jp/projects/luatex-ja/wiki/FrontPage) / pLaTeX / upLaTeX用のクラスファイルと，それに必要なJFMの組み合わせです． + +## 提供されるもの +クラスファイルjlreq.clsと，横書きLuaTeX-ja用のJFMであるjfm-jlreq.luaが用意されています．また，縦書きのJFMやpLaTeX / upLaTeX 用のJFMを生成するいくつかのスクリプトがあります． + +## インストール +`make`で必要なJFMを生成してください．その後， + +* *.tfm -> $TEXMF/fonts/tfm/public/jlreq +* *.vf -> $TEXMF/fonts/vf/public/jlreq +* jfm-jlreq.lua, jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq +* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq + +と配置します．`make install`とすると，$TEXMF=$TEXMFHOMEとしてこのコピーを行います． + +## 使い方 +通常通り +```latex +\documentclass{jlreq} +``` +とします．これで横書きのarticle相当の文書クラスとなります．エンジンは自動判定されますが，指定する場合はクラスオプションに`platex/uplatex/lualatex`のいずれかを渡してください．縦書きにするには`tate`オプションを渡します．また，reportやbook相当の文書クラスとするには，それぞれ`report`や`book`オプションを渡します．たとえば，縦書きの本を作成するには +```latex +\documentclass[tate,book]{jlreq} +``` +とします． + +その他，`oneside / twoside / onecolumn / twocolumn / titlepage / notitlepage / draft / final / openright / openany / leqno / fleqn`というよくあるオプションを受け付けます． + +標準的な文書クラスと同じように中身を書くことができますが，次のような命令が追加 / 拡張されています． + +### `\jlreqsetup` +設定用命令です．プリアンブルでしか使えません．文書に対する設定は，クラスオプションとして行うか`\jlreqsetup`を通じて行うかします．どちらで設定するかは設定項目によります． + +### `\section` +`\section*[running head]{見出し文字列}[副題]`というように，通常の書式に加えて副題を受け付けられるように拡張されています．その他，`\part`（articleのみ），`\chapter`（book/reportのみ），`\subsection`，`\subsubsection`も副題を受け付けます． + +### `abstract`環境 +プリアンブルにもかけるようになっています．プリアンブルに書かれた場合は，`\maketitle`とともに出力されます．二段組の場合は，段組にならず概要を出力することができます． + +### `\sidenote` +この命令は傍注の幅が正の時にのみ定義されます．デフォルトの基本版面ではこの幅は0に設定されています．従って`\sidenote`は定義されません．後の基本版面の設定を参考にしてください． + +`\sidenote`は傍注（縦組みの場合は脚注）を出力します．内部では`\marginpar`を使っています．デフォルトでは`\footnote`と同様の書式となりますが，`\jlreqsetup`で`sidenote_type=symbol`が指定されている場合，その書式は`\sidenote{該当項目}{注}`となります．たとえば +```latex +刊行できる\sidenote{原稿}{印刷などの方法により……}を入手する仕事である． +``` +とします．後の説明も参照してください． + + +### `\endnote` +後注を指定します．`\footnote`と同様の書式です．デフォルトでは，注自身の出力は見出し直前に行われます．この動作は`\jlreqsetup`に`endnote_position`を渡すことで制御できます．詳しくは後の注関係の説明をご覧ください．また`\theendnotes`を実行するとその場に出力をします． + +### `\warichu` +割注を出力します．行分割位置などは自動で計算されます．（複数回のコンパイルが必要．）`\warichu*`ではこれらの位置を手動で指定できます．書式は +``` +\warichu*{(一行目前) & (一行目後)\\ (二行目前) & (二行目後)...} +``` +です．`&`が省略されている場合は自動で調整されます． + +### `\tatechuyoko` +縦中横を出力します．`\tatechuyoko{<文字列>}`とします．縦書きでない場所で使うとエラーになります． + +### `\jafontsize` +和文フォントサイズを指定する`\fontsize`です．クラスオプションで`jafontscale=0.9`とされている場合，`\fontsize{9pt}{15pt}`とすると和文フォントのサイズは`8.1pt`となりますが，`\jafontsize{9pt}{15pt}`とすると`9pt`となります．（欧文フォントサイズは`10pt`となる．）なお，第二引数は`\fontsize`の第二引数と全く同じです． + +### `\　` +全角空白（U+3000）一文字からなるマクロです．和文間隔を挿入します．LuaLaTeXでは`　`のみでも和文間隔を入力できます． + +### その他 +* ルビや圏点は提供されません．[PXrubrica](https://github.com/zr-tex8r/PXrubrica)または`luatexja-ruby`（LuaLaTeX，LuaTeX-jaパッケージに付属）を使うと良いかと思います． +* 日本語組版処理の要件2.3.2.dによれば，横組みにおける二段組の最後のページの各段の行数は揃えることが望ましいとされていますが，この処理は行われません．`nidanfloat`パッケージを使い， + + ```latex + \usepackage[balance]{nidanfloat} + ``` + + とするとこの処理が行われます．ただし，最終ページでの`\newpage`や`\clearpage`が正しく動作しません．詳しくは`nidanfloat`パッケージのマニュアルをご覧ください． +* フォントを設定する機能は有していません．和文フォントは，LuaLaTeX利用時は`luatexja-fontspec`や`luatexja-preset`（いずれもLuaTeX-jaパッケージに付属）により設定することができます．dvipdfmxを使う場合は，[PXchfon](https://github.com/zr-tex8r/PXchfon)での設定が可能です． + + +## 各種設計 +設計はクラスオプションまたは`\jlreqsetup`によりkeyval形式で行います．以下では次の用法を使います． + +* `[A/B]`：AまたはBです．`[A/B/C]`等も同様． +* `<寸法>`：TeXが認識する寸法です．簡単な式（`10pt+10pt`のような）を使うこともできます．また，クラスオプションでは，場合によっては次のような特殊な値を使うこともできます．（これらはpLaTeX / upLaTeXではもとから利用可能ですが，LuaLaTeXでも利用可能なように処理されています．）`\jlreqsetup`内のような場所では，常に`\zw`や`\zh`により全角幅が記述できます．以下，たとえば`Q`が利用可能な場合は`<寸法;Q>`のように記述します． + - `Q`：0.25mmと解釈されます． + - `zw`, `zh`：全角幅として解釈されます． + + +### 基本版面 +クラスオプションです． + +* `paper=[<紙サイズ名>/{<寸法>,<寸法>}]`：紙サイズです．紙サイズ名はa0からa10，b0からb10，c2からc8を指定できます．B列はJIS B列です．また，`{<横>,<縦>}`と直接寸法を指定することもできます． +* `fontsize=<寸法;Q>`：欧文フォントサイズ．デフォルトは10pt． +* `jafontsize=<寸法;Q>`：和文フォントサイズ． +* `jafontscale=<実数値>`：欧文フォントと和文フォントの比（和文 / 欧文）．`fontsize`と`jafontsize`が両方指定されている場合は無視される．デフォルトは1． +* `line_length=<寸法;zw,zh>`：一行の長さ．デフォルトは字送り方向の紙幅の0.75倍．実際の値は一文字の長さの整数倍になるように補正されます． +* `number_of_lines=<自然数値>`：一ページの行数．デフォルトは行送り方向の紙幅の0.75倍になるような値． +* `gutter=<寸法;zw,zh>`：のどの余白の大きさ． + - `tate`無指定時は奇数ページ左，偶数ページ右の余白 + - `tate`指定時は奇数ページ右，偶数ページ左の余白 + - `twoside`が指定されていない時は，常に奇数ページ扱いで余白が設定される +* `head_space=<寸法;zw,zh>`：天の空き量．デフォルトは中央寄せになるような値． +* `foot_space=<寸法;zw,zh>`：地の空き量．デフォルトは中央寄せになるような値． +* `baselineskip=<寸法;Q,zw,zh>`：行送り．デフォルトは`jafontsize`の1.7倍． +* `linegap=<寸法;Q,zw,zh>`：行間． +* `headfoot_sidemargin=<寸法;zw,zh>`：柱やノンブルの左右の空き． +* `column_gap=<寸法;zw,zh>`：段間（`twocolumn`指定時のみ）． +* `sidenote_length=<寸法;zw,zh>`：傍注の幅を指定します． + +### 組み方 +クラスオプションです． +* `open_bracket_pos=[zenkaku_tentsuki/zenkakunibu_nibu/nibu_tentsuki]`：始め括弧が行頭に来た際の配置方法を指定します．それぞれ段落開始全角折り返し行頭天付き（デフォルト），段落開始全角二分折り返し行頭二分，段落開始二分折り返し行頭天付きを意味します． +* `hanging_punctuation`：ぶら下げ組をします． + +### 注関係 +`\jlreqsetup`で指定します． + +* `reference_mark=[inline/interlinear]`：合印の配置方法を指定します．`inline`にすると該当項目の後ろの行中に配置します．`interlinear`を指定すると該当項目の上（横組）または右（縦組）に配置します． +* `footnote_second_indent=<寸法>`: 脚注（横書き時）または傍注（縦書き時）の二行目以降の字下げ量を指定します．一行目からの相対字下げ量です． +* `sidenote_type=[number/symbol]`：傍注と本文との対応の方法を指定します．`number`が規定で，注の位置に通し番号が入り，それにより対応が示されます．`symbol`とすると，注の位置に特定の記号が入り，また注がついている単語が強調されます． +* `sidenote_symbol=<記号>`：`sidenote_symbol=symbol`の時に，注の位置に入る記号．デフォルト＊ +* `sidenote_keyword_font=<命令>`：`sidenote_symbol=symbol`の時に，注のついている単語のフォント指定．デフォルトは無し（強調しない） +* `endnote_second_indent=<寸法>`: 後柱の二行目以降の字下げ量を指定します．一行目からの相対字下げ量です． +* `endnote_position=[headings/paragraph/{_<見出し名1>,_<見出し名2>,...}]`：後注の出力場所を指定します．`headings`は各見出しの直前（デフォルト），`paragraph`は改段落の際に出力します．また，`endnote_position={_chapter,_section}`とすると，`\chapter`と`\section`の直前に出力します． + +### キャプション +図表のキャプションを`\jlreqsetup`で変更できます． +* `caption_font=<命令>`：キャプション自身のフォントを指定します． +* `caption_label_font=<命令>`：キャプションのラベルのフォントを指定します． +* `caption_after_label_space=<寸法>`：ラベルとキャプションの間の空きを指定します． +* `caption_label_format=<書式>`：ラベルの書式を指定します．`caption_label_format={#1：}`のようにします．`#1`が「図1」のような番号に置換されます． +* `caption_align=[{left/right/center/bottom/top/<環境名1>=<位置指定1>,<環境名2>=<位置指定2>,...}]`：キャプションの場所を指定します．`caption_align=left`のように指定します．`caption_align={center,table=right}`とすると，`table`のみ右，そのほかは中央配置となります． + +### 引用 +`quote / quotation / verse`環境の挙動を`\jlreqsetup`で指定できます． +* `quote_indent=<寸法>`：字下げを指定します．デフォルトは2zwです．一行の長さが文字サイズの整数倍になるように調整されます． +* `quote_end_indent=<寸法>`：字上げを指定します．デフォルトは0zwです． +* `quote_beforeafter_space=<寸法>`：前後の空きを指定します．`quote_beforeafter_space=1\baselineskip`とすると一行あきます． +* `quote_fontsize=[normalsize/small/footnotesize/scriptsize/tiny]`：フォントサイズを指定します． + +### 箇条書き +`\jlreqsetup`で指定します． +* `itemization_beforeafter_space=<寸法>`：箇条書きの前後の空きを指定します．`itemization_beforeafter_space={i=<寸法>}`とするとトップレベルのみに設定を行います．`itemization_beforeafter_space={0pt,i=10pt,ii=5pt}`とすれば，レベル1の箇条書きに10ptを，レベル2のそれに5ptを，それ以外には0ptを設定します．レベルは上記のように小文字ローマ数字で指定します． +* `itemization_itemsep=<寸法>`：項目同士の空きを指定します． + +### 定理環境 +`\jlreqsetup`で指定します． +* `theorem_beforeafter_space=<寸法>`：定理環境の前後の空きを指定します． + +## 見出し +見出しの設定は，`\Declare***Heading`という命令で行います（***には見出しの種類に応じた文字列が入る）．書式はすべて + +``` +\Declare***Heading{<命令名>}{<レベル>}{<設定>} +``` + +となっています．また，`\New***Heading`，`\Renew***Heading`，`\Provide***Heading`も同時に用意されます．それぞれ + +* `\New***Heading`：指定した名前の命令が既に定義されている場合はエラー． +* `\Renew***Heading`：指定した名前の命令が定義されていなければエラー． +* `\Provide***Heading`：指定した名前の命令が定義されていない場合に限り見出し命令の定義が行われる． + +となっています． + +### 扉見出し +`\DeclareTobiraHeading`で作成します．通常のクラスファイルにおける`\section`等と同じ書式の命令ができます．設定は以下の通り． + +* `type=[han/naka]`：`han`だと半扉見出しを，`naka`だと中扉見出しを作ります． +* `pagestyle=<ページスタイル>`：見出し箇所のページスタイルを指定します． +* `label_format=<書式>`：ラベルを出力する命令を指定します．たとえば`label_format={第\thechapter 章}`のように指定します． +* `format=<書式>`：実際に出力する書式を指定します．`format={\null\vfil {\Huge\bfseries #1#2}}`のようにします．`#1`はラベルに，`#2`は見出し文字列に置き換えられます． + +### 別行見出し +`\DeclareBlockHeading`で作成します．`\<命令名>*[running head]{見出し文字列}[副題]`という書式の命令を作成します．設定は以下の通り． + +#### 書式関連 +* `font=<命令>`：見出しのフォントを指定します． +* `subtitle_font=<命令>`：副題のフォントを指定します． +* `label_format=<命令>`：ラベルのフォーマットを指定します．`label_format={第\thechapter 章}`などのようにします． +* `subtitle_format=<命令>`：副題のフォーマットを指定します．`subtitle_format={「#1」}`のようにします．`#1`が副題自身になります． + +#### インデント関連 +* `align=[left/center/right]`：見出し位置の横方向の配置場所を指定します． +* `indent=<寸法>`：見出し全体の字下げ量を指定します． +* `end_indent=<寸法>`：見出し全体の字上げ量を指定します． +* `after_label_space=<寸法>`：ラベル後，見出し文字列までの空きを指定します． +* `second_heading_text_indent=[<寸法>/{<寸法>,<寸法>}]`：見出し文字列の二行目以降のインデントを指定します．一行目の頭を起点として指定しますが，`second_heading_text_indent=*1\zw`のように先頭に`*`をつけるとラベルの頭を起点としての指定になります．（ラベルがない時は一行目の頭が起点．）また，`second_heading_text_indent={<ラベルがある時>,<ラベルがない時>}`という指定をすると，ラベルの有無に応じて値を変更することができます．`<ラベルがある時>`の指定ではやはり`*`を使うことができます． +* `subtitle_indent=<寸法>`：副題のインデント量を指定します．見出し文字列の一行目を起点として指定します． + +#### その他 +* `subtitle_break=[true/false]`：見出し文字列と副題の間を改行するか指定します． +* `allowbreak_if_evenpage=[true/false]`：見出しが偶数ページにあった場合，その直後の改ページを許可します． +* `pagebreak=[clearpage/cleardoublepage/clearcolumn/nariyuki/begin_with_odd_page/begin_with_even_page]`：見出し直前の改ページを指定します．それぞれ，改ページ，`\cleardoublepage`実行，改段，なりゆき，奇数ページ開始，偶数ページ開始，です． +* `afterindent=[true/false]`：見出し直後の段落の字下げを行うかを指定します． +* `column_spanning=[true/false]`： 段抜きの見出しにします．`pagebreak=nariyuki`または`pagebreak=clearcolumn`の時には無視されます． + +#### 行取り +行取りの指定は以下のいずれかの方法で行うことができます． + +* 行数を指定し，その中央に配置します．`lines=<自然数値>`により行数を指定します．`before_lines=<自然数値>`や`after_lines=<自然数値>`により，さらに前後に追加する行数を指定します．たとえば`lines=3,after_lines=1`とすれば，四行の中に配置され，前の空きよりも後ろの空きの方が一行分大きくなります．`before_lines`により指定された空きはページ頭には入りませんが，`before_lines=*1`というように`*`を先頭につけると常に入るようになります． +* 行数と，前後いずれかの空きを指定します．`lines=<自然数値>`により行数を，`before_space=<寸法>`または`after_space=<寸法>`のいずれかの指定によりそれぞれ前または後ろの空きを指定します． +* 前後の空きを指定します．`before_space=<寸法>`および`after_space=<寸法>`を指定します． + +#### 連続して掲げる見出しの行取り +``\SetBlockHeadingSpaces``により，見出しが連続して掲げられたときの行取りを設定することができます．``\SetBlockHeadingSpaces``は + +```latex +\SetBlockHeadingSpaces{ + {_part{lines=3,before_lines=1},_section{lines=2},_subsection{lines=2}} + [lines=5]{_section,23pt,_subsection,16pt} +} +``` + +のように使います．この意味は次の通りです． + +* `\part`，`\section`，`\subsection`という順番で見出しが掲げられていて，その前後が見出しでない場合は，`\part`は三行取り＋前に一行空き，`\section`と`\subsection`は二行取りとなります． +* `\section`，`\subsection`という順番で見出しが掲げられていて，その前後が見出しでない場合は，全体で五行取りとし，`\section`と`\subsection`との間に`23pt`の空き，`\subsection`の後に`16pt`の空きを入れます． + +個々の設定は以下のようになります． + +* 各々の``{}``内には``_<見出し命令名>``か``<寸法>``をカンマ区切りで並べます． +* 先頭に``[]``で囲まれた設定を追加できます．これは連続して掲げられた見出し全体への設定となります．``lines / before_lines / after_lines / before_space / after_space``が利用可能です．各々の意味は上述の行取り指定と同じです． +* 寸法はそのまま空き量を表します． +* ``_<見出し命令名>``の後に``{}``で囲まれた設定を追加することで，その見出しの空き量を設定します．設定しない場合は前後に空きが入りません． +* 見出しに対する``{}``で囲まれた設定内では，``lines / before_lines / after_lines / before_space / after_space``が利用可能です．各々の意味は上述の行取り指定と同じです． +* ``{}``で囲まれた部分を``*``のみにすると（例えば``_section{*}``とすると）単独で掲げた場合と同じ設定を使います． + +なお，見出しが連続しているかは単純に別行見出しの命令が並んで書かれているかのみで判断します．従ってそれらの命令間に出力には関係しないような命令が挟まっていたとしても，見出しが連続して掲げられているとは判断されません．ただし，見出し命令の間に空白，改行または`\label[<オプション>]{<引数>}…{<引数>}`という形のもののみが挟まれている場合は，見出しが連続していると判断されます． + +### 同行見出し +`\DeclareRuninHeading`で作成します．通常の文書クラスにおける`\section`と同様の，`\<命令名>*[running head]{見出し文字列}`という書式の命令が作成されます．設定は以下の通り． + +* `font=<命令>`：見出しのフォントを指定します． +* `indent=<寸法>` 見出し文字列全体の字下げ量を指定します． +* `after_label_space=<寸法>`：ラベル後，見出し文字列までの空きを指定します． +* `label_format=<命令>`：ラベルのフォーマットを指定します．`label_format={\theparagraph}`などのようにします． + +### 窓見出し +`\DeclareCutinHeading`で作成します．`\<命令名>{見出し文字列}`という書式の命令を作成します．設定は以下の通り． + +* `font=<命令>`：見出しのフォントを指定します． +* `indent=<寸法>`：見出し全体の字下げ量を指定します． +* `after_space=<寸法>`：見出しと本文との間の空きを指定します． +* `onelinemax=<寸法>`, `twolinemax=<寸法>`：見出し文字列の長さが`onelinemax`以下ならば一行で，`twolinemax`以下ならば二行で窓見出しを出力します．それ以上の場合は三行です．デフォルトはそれぞれ6文字，20文字の長さ． + +### `\ModifyHeading` +既に（上のどれかを使い）定義された見出し命令の設定を変更します．たとえば +```latex +\ModifyHeading{section}{lines=10} +``` +とすると，`\section`のフォントなどの設定はそのままに，行取りのみが10行に変更されます．見出しの種類を変更することはできません． + +### `\SaveHeading` +見出し命令の定義を待避します． +```latex +\SaveHeading{section}{\restoresection} % \sectionの中身を\restoresectionに待避． +\RenewBlockHeading{section}{1}{font=……} % \sectionを新しく定義する． +…… +\restoresection % \sectionの中身を元に戻す． +``` +のように使います． + +## ページスタイル +``` +\DeclarePageStyle{<ページスタイル名>}{<設定>} +``` +によりページスタイルを定義することができます．`<設定>`はkeyval形式です．定義したページスタイルは`\pagestyle`で適用できます．設定は以下の通り． + +* `yoko`：横書きで上下に出力します．デフォルト． +* `tate`：縦書きで小口側に出力します． +* `font=<命令>`：柱とノンブルのフォントを指定します． +* `running_head_position`, `nombre_position`：柱とノンブルの位置を指定します．`yoko`か`tate`のどちらが指定されているかで指定方法が変わります． + - `yoko`指定時：`top-left`のように指定できます．`top / bottom / center / left / right / gutter / fore_edge`が使えます．`gutter`はのど，`fore_edge`は小口です．`left`，`right`の指定は奇数ページに対するものです．`twoside`が指定されている場合，偶数ページはその逆になります． + - `tate`指定時：`<寸法>`が指定できます．`running_head_position`は柱の天からの下げ量を，`nombre_position`はノンブルの地からの上げ量を指定します． +* `nombre=<書式>`：出力するノンブルを指定します．デフォルトは`\thepage`． +* `odd_running_head=<書式>`，`even_running_head=<書式>`：それぞれ奇数ページ，偶数ページの柱を指定します．`_section`のように`_`から始まる名前を指定すると，対応する見出しを出力します．（`_section`だと現在の`\section`を出力する．） +* `mark_format={[odd=<書式>/even=<書式>/_<見出し命令名>=<書式>],...}`：見出しを柱に出力する際のフォーマットを指定します．`mark_format={_section={節\thesection：#1},_chapter={第\thechapter 章\quad #1}}`のように指定します．見出し命令名の代わりに`odd`や`even`も指定でき，それぞれ奇数ページ/偶数ページの柱の書式になります．`\pagestyle`実行時に`\sectionmark`等を定義することで実現しています． +* `nombre_ii=<書式>`: 二つ目のノンブルを指定します．`nombre_ii_position`で場所指定もできます．指定方法は`nombre`や`nombre_position`と同じです．`odd_running_head_ii`，`even_running_head_ii`，`running_head_ii_position`もあります．`nombre_ii_position`や`running_head_ii_position`が指定されなかった場合，`yoko`指定時にはそれぞれ`nombre_position`および`running_head_position`と同じ位置に設定されます．`tate`指定時は一つ目のノンブルや柱に続く場所に表示されます． + + +`\NewPageStyle`，`\RenewPageStyle`，`\ProvidePageStyle`もあります．`\ModifyPageStyle`により既存のページスタイルを改変することが可能です． + +## JFM +以下のような独自のJFMを使います．パッケージによっては，パッケージ独自のJFMや，また標準のJFMを使うように設定がし直される場合があります．例えばLuaTeX-jaに付属するluatexja-presetパッケージは通常LuaTeX-ja標準のJFMを使います．本クラスファイルで使っているJFMを使う場合は， + +```LaTeX +\usepackage[jfm_yoko=jlreq,jfm_tate=jlreqv,hiragino-pron]{luatexja-preset} +``` + +のようにオプションで指定する必要があります． + +### pLaTeX/upLaTeXの場合 +JFMの名前は次の通りです．`[]`で囲まれている文字は設定により入ったり入らなかったりします． +``` +[u][b][z]jlreq[g][-v] +``` +それぞれの文字は以下の場合に入ります． + +* `u`: upLaTeX利用時 +* `b`: ぶら下げ組み利用時．（クラスオプションに`hanging_punctuation`が指定された時．） +* `z`: 行頭における開き括弧類の前の空きが，段落開始時が全角二分，折り返し時が二分の時．（クラスオプションに`open_bracket_pos=zenkakunibu_nibu`が指定された時．） +* `g`: ゴシック用フォント． +* `-v`: 縦書き用． + +例えば，ぶら下げ組みを利用せず，クラスオプションに`open_bracket_pos=zenkakunibu_nibu`が指定されいてるソースをpLaTeXで処理した場合，横書き明朝体には`zjlreq`という名前のJFMが使われます． + +### LuaLaTeXの場合 +* 横書き用のJFMは`jlreq` +* 縦書き用のJFMは`jlreqv` + +となります．ゴシックも同じJFMを使います． + + +## その他 +* クラスオプション`jlreq_notes`が渡されると，日本語組版処理の記述と矛盾する設定が行われた場合に通知がされます． + +## ライセンス +このパッケージは二条項BSDライセンスの元で配布されています．詳しくは[LICENSE](LICENSE)をご覧ください． + +## 履歴 +* 2017-02-08 + - 最初のバージョン． +* 2017-02-17 + - いくつかバグを修正． + - クラスオプション/`\jlreqsetup`にいくつかのキーを追加/変更． + - `abstract`環境を実装． + - パッケージを読み込んでいるだけのはやめた． +* 2017-03-14 + - いくつかバグを修正． + - 和文ファミリを欧文ファミリに従属させるようにした． + - `\DeclareBlockHeading`にオプションをたくさん追加． + - quote環境などを調整するオプションを追加． +* 2017-03-20 + - バグ修正． + - `\footnote / \sidenote / \endnote`の周りに必要ならば空白を挿入するようにした． +* 2017-04-04 + - バグ修正． + - `\DeclarePageStyle`に`tate`と`font`オプションを追加． +* 2017-04-29 + - バグ修正 + - `jafontsize`と`jafontscale`をクラスオプションに，また`\jafontsize`を追加． + - `\tatechuyoko`を追加． + - クラスオプション`jlreq_warnings`を`jlreq_notes`に変更． + - いくつかのクラスオプションを`\jlreqsetup`に移動． + - いくつかのオプションを`\jlreqsetup`に追加． + - クラスオプションの`paper={<縦>,<横>}`を`paper={<横>,<縦>}`に変更． +* 2017-06-11 + - `plext` / `lltjext`の読み込みを中止． + - `\DeclareBlockHeading`に`align`を追加．`indent=center`や`end_indent=center`を廃止． + - 一部の`\kcatcode` (upLaTeX時) を変更． +* 2017-08-13 + - `column_spanning`を`\DeclareBlockHeading`に追加． + - ページレイアウトにおける「本文の長さ」に傍注の長さを入れるようにした． + - 傍注の長さのデフォルトを0とした． + - 傍注の長さが0の時には`\sidenote`を定義しないようにした． + - 和文間隔を挿入する命令を追加． +* 2017-08-29 + - 縦書きでも著者名が横書きで出てしまうバグを修正． +* 2017-11-23 + - バグ修正 + - `\SetBlockHeadingSpaces`を追加． + - `\contentsname` と `\indexname`に入っていたスペースを削除． +* 2017-12-02 + - バグ修正 +* 2017-12-22 + - JFMを改善． + - 別行見出しの間の`\label`の検出方法を変更． + - `\theequation`，`\thefigure`，`\thetable`に章番号を追加． +* 2018-02-01 + - 縦書きの傍注は奇数ページにのみ出るようにした（改善の余地ありかも）． + - LuaTeX時に`\fnfixbottomtrue`を追加． + - キャプション関係のオプションを`\jlreqsetup`に追加． + - `itemization_beforeafter_space`を拡張． + - バグ修正． +* 2018-04-11 + - 縦書き二段組みの傍注を下段に出すようにした． + - `begin_width_(odd|even)_page`を`\DeclareBlockHeading`に追加． + - `\labelenumi`らをjarticleなどにあわせた． + - `column_gap`クラスオプションを使うとコンパイルできなかったバグ修正． + - `mark_format`を`\DeclarePageStyle`に追加． +* 2018-05-19 + - 目次内のラベルの長さを今までよりも長くした． + - 一部のマクロをjlreq-helpers.styに分離した． + - バグ修正． +* 2018-06-17 + - シリーズbもゴシックにするようにした． + - バグ修正． +* 2018-08-08 + - `\DeclarePageStyle`に`nombre_ii`等を追加． + - バグ修正． + - `\jlreqsetup`に`footnote_second_indent`と`endnote_second_indent`を追加． +* 2018-08-15 + - バグ修正． + + +-------------- +Noriyuki Abe +https://github.com/abenori/jlreq diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/README.md texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/jlreq/README.md 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/jlreq/README.md 2018-08-16 20:48:00.000000000 +0000 @@ -1,94 +1,100 @@ -# jlreq - -## What is this? -This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/). - -## Installation -Run `make`, then JFM files are created. Move the files as follows: - -* *.tfm -> $TEXMF/fonts/tfm/public/jlreq -* *.vf -> $TEXMF/fonts/vf/public/jlreq -* jfm-jlreq.lua jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq -* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq - -`make install` will do this where $TEXMF=$TEXMFHOME - -## Usage -See [README-ja.md](README-ja.md) (in Japanese). - -## LICENSE -This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENSE). - -## CHANGELOG -* 2017-02-08 - - First release. -* 2017-02-17 - - Fixed bugs. - - Implement `abstract` environment. - - Changed/Added some keys to class option/`\jlreqsetup` - - Stopped to load `pxrubirica`, `luatexja-ruby` and `nidanfloat`. -* 2017-03-14 - - Fixed bugs. - - `\sffamily` etc. also change the Japanese font family. - - Added many options to `\DeclareBlockHeading`. - - Some options related to `quote` environment etc. -* 2017-03-20 - - Fixed bugs. - - Insert some spaces around `\footnote / \sidenote / \endnote`. -* 2017-04-04 - - Fixed a bug. - - Added options `tate` and `font` to `\DeclarePageStyle`. -* 2017-04-29 - - Fixed bugs. - - Added `jafontsize` and `jafontscale` options and `\jafontsize`. - - Added `\tatechuyoko`. - - `jlreq_warnings` -> `jlreq_notes` (class option). - - Moved some class options to `\jlreqsetup`. - - Added some options to `\jlreqsetup`. - - `paper={,}` -> `paper={,}`. -* 2017-06-11 - - Stopped to load `plext` and `lltjext`. - - Added `align` to `\DeclareBlockHeading` and delete `indent=center`, `end_indent=center`. - - Changed `\kcatcode` for some characters (upLaTeX). -* 2017-08-13 - - Added `column_spanning` to `\DeclareBlockHeading`. - - Sidenotes are a part of the main text now. - - Changed the default length of sidenotes to 0. - - jlreq does not define `\sidenote` if the length for sidenotes is zero. - - Added a command for the full-width ideographic space. -* 2017-08-29 - - Fixed a bug. -* 2017-11-23 - - Fixed bugs. - - Added `\SetBlockHeadingSpaces`. - - Removed a space from `\contentsname` and `\indexname`. -* 2017-12-02 - - Fixed bugs. -* 2017-12-22 - - Improved JFM. - - Change the way to detect `\label` between block headings. - - Added chapter number to `\theequation`，`\thefigure`，`\thetable`. -* 2018-02-01 - - Sidenotes appears only odd pages in `tate` mode. - - Added `\fnfixbottomtrue` for LuaLaTeX. - - Added some options related to captions. - - Extended `itemization_beforeafter_space`. - - Fixed bugs. -* 2018-04-11 - - Sidenotes (`\footnote`) appears in the second column in `tate` mode. - - Added options `begin_widh_(odd|even)_page` to `\DeclareBlockHeading`. - - Changed `\labelenumi` as in `jarticle` etc. - - Fix a bug on `column_gap` class option. - - Added `mark_format` to `\DeclarePageStyle`. -* 2018-05-19 - - Made the width of the label in the table of contents longer. - - Moved some macros to jlreq-helpers.sty - - Fixed bugs. -* 2018-06-17 - - Gothic font is attached to font shape 'b'. - - Fixed bugs. - - --------------- -Noriyuki Abe -https://github.com/abenori/jlreq +# jlreq + +## What is this? +This package provides the class file and JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / upLaTeX. This aims to implement [Requirements for Japanese Text Layout](https://www.w3.org/TR/jlreq/). + +## Installation +Run `make`, then JFM files are created. Move the files as follows: + +* *.tfm -> $TEXMF/fonts/tfm/public/jlreq +* *.vf -> $TEXMF/fonts/vf/public/jlreq +* jfm-jlreq.lua jfm-jlreqv.lua -> $TEXMF/tex/luatex/jlreq +* jlreq.cls, jlreq-helpers.sty -> $TEXMF/tex/latex/jlreq + +`make install` will do this where $TEXMF=$TEXMFHOME + +## Usage +See [README-ja.md](README-ja.md) (in Japanese). + +## LICENSE +This package is distributed under the BSD 2-Clause License. See [LICENSE](LICENSE). + +## CHANGELOG +* 2017-02-08 + - First release. +* 2017-02-17 + - Fixed bugs. + - Implement `abstract` environment. + - Changed/Added some keys to class option/`\jlreqsetup` + - Stopped to load `pxrubirica`, `luatexja-ruby` and `nidanfloat`. +* 2017-03-14 + - Fixed bugs. + - `\sffamily` etc. also change the Japanese font family. + - Added many options to `\DeclareBlockHeading`. + - Some options related to `quote` environment etc. +* 2017-03-20 + - Fixed bugs. + - Insert some spaces around `\footnote / \sidenote / \endnote`. +* 2017-04-04 + - Fixed a bug. + - Added options `tate` and `font` to `\DeclarePageStyle`. +* 2017-04-29 + - Fixed bugs. + - Added `jafontsize` and `jafontscale` options and `\jafontsize`. + - Added `\tatechuyoko`. + - `jlreq_warnings` -> `jlreq_notes` (class option). + - Moved some class options to `\jlreqsetup`. + - Added some options to `\jlreqsetup`. + - `paper={,}` -> `paper={,}`. +* 2017-06-11 + - Stopped to load `plext` and `lltjext`. + - Added `align` to `\DeclareBlockHeading` and delete `indent=center`, `end_indent=center`. + - Changed `\kcatcode` for some characters (upLaTeX). +* 2017-08-13 + - Added `column_spanning` to `\DeclareBlockHeading`. + - Sidenotes are a part of the main text now. + - Changed the default length of sidenotes to 0. + - jlreq does not define `\sidenote` if the length for sidenotes is zero. + - Added a command for the full-width ideographic space. +* 2017-08-29 + - Fixed a bug. +* 2017-11-23 + - Fixed bugs. + - Added `\SetBlockHeadingSpaces`. + - Removed a space from `\contentsname` and `\indexname`. +* 2017-12-02 + - Fixed bugs. +* 2017-12-22 + - Improved JFM. + - Change the way to detect `\label` between block headings. + - Added chapter number to `\theequation`，`\thefigure`，`\thetable`. +* 2018-02-01 + - Sidenotes appears only odd pages in `tate` mode. + - Added `\fnfixbottomtrue` for LuaLaTeX. + - Added some options related to captions. + - Extended `itemization_beforeafter_space`. + - Fixed bugs. +* 2018-04-11 + - Sidenotes (`\footnote`) appears in the second column in `tate` mode. + - Added options `begin_widh_(odd|even)_page` to `\DeclareBlockHeading`. + - Changed `\labelenumi` as in `jarticle` etc. + - Fix a bug on `column_gap` class option. + - Added `mark_format` to `\DeclarePageStyle`. +* 2018-05-19 + - Made the width of the label in the table of contents longer. + - Moved some macros to jlreq-helpers.sty + - Fixed bugs. +* 2018-06-17 + - Gothic font is attached to font shape 'b'. + - Fixed bugs. +* 2018-08-08 + - Added `nombre_ii` etc. to `\DeclarePageStyle`. + - Fixed bugs. + - Added `footnote_second_indent` and `endnote_second_indent` to `\jlreqsetup`. +* 2018-08-15 + - Fixed bugs. + + +-------------- +Noriyuki Abe +https://github.com/abenori/jlreq Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/lshort-zh-cn.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/lshort-zh-cn.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/README.md texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/README.md 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/README.md 2018-08-11 20:51:45.000000000 +0000 @@ -1,4 +1,4 @@ -# The Not So Short Introduction To LaTeX (Chinese Edition), v5.10 +# The Not So Short Introduction To LaTeX (Chinese Edition), v5.11 ## License diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/README-zh.md texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/README-zh.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/README-zh.md 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/README-zh.md 2018-08-11 20:51:45.000000000 +0000 @@ -1,4 +1,4 @@ -# 中文版 lshort，5.10 版 +# 中文版 lshort，5.11 版 ## 许可证 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.01.basics.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.01.basics.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.01.basics.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.01.basics.tex 2018-08-11 20:51:45.000000000 +0000 @@ -189,7 +189,7 @@ \begin{center} \begin{tabular}{ccc} \hline - & plain \TeX\ 格式 & \LaTeX\ 格式 \\ + & \textbf{plain \TeX\ 格式} & \textbf{\LaTeX\ 格式} \\ \hline \TeX\ 引擎 & \texttt{tex} & N/A \\ \hologo{pdfTeX} 引擎 & \texttt{etex} & \texttt{latex}\footnotemark \\ @@ -262,24 +262,23 @@ 其中 \Arg{class-name} 为文档类的名称，如 \LaTeX\ 提供的 \cls{article}, \cls{book}, \cls{report}， 在其基础上派生的一些文档类如支持中文排版的 \cls{ctexart} / \cls{ctexbook} / \cls{ctexrep}， 或者有其它功能的一些文档类，如 \cls{moderncv} / \cls{beamer} 等。 -\LaTeX\ 提供的基础文档类见表 \ref{tbl:ltx-classes}，前三个习惯上称为“标准文档类”。 +\LaTeX\ 提供的基础文档类见表 \ref{tbl:ltx-classes}，其中前三个习惯上称为“标准文档类”。 \begin{table}[htp] -\caption{\LaTeX\ 提供的基础文档类}\label{tbl:ltx-classes} -\hrule -\begin{description} - \item [\texttt{article}] 文章格式的文档类，广泛用于科技论文、报告、说明文档等。 - \item [\texttt{report}] 长篇报告格式的文档类，具有章节结构，用于综述、长篇论文、简单的书籍等。 - \item [\texttt{book}] 书籍文档类，包含章节结构和前言、正文、后记等结构。 -\end{description} -\hrule -\begin{description} - \item [\texttt{proc}] 基于 \cls{article} 文档类的一个简单的学术文档模板。 - \item [\texttt{slides}] 幻灯格式的文档类，使用无衬线字体。 - \item [\texttt{minimal}] 一个极其精简的文档类，只设定了纸张大小和基本字号， - 用作代码测试的最小工作示例（Minimal Working Example）。 -\end{description} -\hrule +\centering +\caption{\LaTeX\ 提供的基础文档类。}\label{tbl:ltx-classes} +\begin{tabular}{lp{30em}} + \hline + \texttt{article} & 文章格式的文档类，广泛用于科技论文、报告、说明文档等。\\ + \texttt{report} & 长篇报告格式的文档类，具有章节结构，用于综述、长篇论文、简单的书籍等。\\ + \texttt{book} & 书籍文档类，包含章节结构和前言、正文、后记等结构。\\ + \hline + \texttt{proc} & 基于 \cls{article} 文档类的一个简单的学术文档模板。\\ + \texttt{slides} & 幻灯格式的文档类，使用无衬线字体。\\ + \texttt{minimal} & 一个极其精简的文档类，只设定了纸张大小和基本字号， + 用作代码测试的最小工作示例（Minimal Working Example）。 \\ + \hline +\end{tabular} \end{table} \pinyinindex{xuanxiang}{选项（宏包/文档类）} @@ -292,7 +291,7 @@ \LaTeX\ 的三个标准文档类可指定的选项见表 \ref{tbl:ltx-options}。 \begin{table}[htp] -\caption{\LaTeX\ 的三个标准文档类可指定的选项}\label{tbl:ltx-options} +\caption{\LaTeX\ 的三个标准文档类可指定的选项。}\label{tbl:ltx-options} \hrule \begin{description} \item[\texttt{10pt, 11pt, 12pt}] \quad 指定文档的基本字号。缺省为 \texttt{10pt}。 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.02.text.tex 2018-08-11 20:51:45.000000000 +0000 @@ -210,13 +210,13 @@ \subsubsection{波浪号} 我们在 \ref{subsec:special-chars} 小节中了解了 \cmd{\textasciitilde} 命令，它可以用来输入波浪号， -但位置靠顶端，可能不甚理想。有的人可能喜欢用数学公式里的 \cmd{sim} 符号来代替： +但位置靠顶端，可能不甚理想（位于顶端的原因是波浪号主要用作重音，参考下一小节）。有的人可能喜欢用数学公式里的 \cmd{sim} 符号来代替： \begin{example} -a\~{}z \qquad a$\sim$z +1\~{}3 \qquad 1$\sim$2 \end{example} 更合理的波浪号请参考 \ref{subsec:font-encs} 小节讨论的内容。 -有的时候，使用中文的全角波浪号也不失为一个办法（西文中使用波浪号的情形较少见）。 +使用中文的全角波浪号也不失为一个办法（西文中使用波浪号的情形较少见）。 \subsection{特殊西文符号与重音}\label{subsec:accents} @@ -279,9 +279,11 @@ \cmdindex{TeX,LaTeX,LaTeXe} 我们见到的所有错落有致的 \LaTeX\ 标志都是由以下命令输入的： \begin{center} -\begin{tabular}{*{6}{l}} +\begin{tabular}{*{2}{l}} \hline - \TeX & \cmd{TeX} & \LaTeX & \cmd{LaTeX} & \LaTeXe & \cmd{LaTeXe} \\ + \TeX & \cmd{TeX} \\ + \LaTeX & \cmd{LaTeX} \\ + \LaTeXe & \cmd{LaTeXe} \\ \hline \end{tabular} \end{center} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.03.elements.tex 2018-08-11 20:51:45.000000000 +0000 @@ -378,7 +378,7 @@ \begin{example} Rabindranath Tagore's short poem: \begin{verse} -Beauty is truth’s smile +Beauty is truth's smile when she beholds her own face in a perfect mirror. \end{verse} @@ -472,11 +472,13 @@ \subsection{列格式}\label{subsec:tabular-cols} -\LaTeX\ 表格中基本的列格式如下表： -\begin{center} -\begin{tabular}{lp{24em}} +\env{tabular} 环境使用 \Arg{column-spec} 参数指定表格的列数以及每列的格式。基本的列格式见表 \ref{tbl:table-column-spec}。 +\begin{table}[htp] +\centering +\caption{\LaTeX\ 表格列格式。}\label{tbl:table-column-spec} +\begin{tabular}{*{2}{l}} \hline - 列格式 & 说明 \\ + \textbf{列格式} & \textbf{说明} \\ \hline \ttfamily l/c/r & 单元格内容左对齐/居中/右对齐，不折行 \\ \ttfamily p\marg{width} & 单元格宽度固定为 \Arg{width}，可自动折行 \\ @@ -484,7 +486,7 @@ \ttfamily @\marg{string} & 自定义内容 \Arg{string} \\ \hline \end{tabular} -\end{center} +\end{table} \begin{example} \begin{tabular}{lcr|p{6em}} @@ -527,7 +529,8 @@ \end{tabular} \end{example} -辅助格式甚至支持插入 \cmd{centering} 等命令改变 \texttt{p} 列格式的对齐方式，一般还要加额外的命令 \cmd{array\-back\-slash} 以免出错% +辅助格式甚至支持插入 \cmd{centering} 等命令改变 \texttt{p} 列格式的对齐方式， +一般还要加额外的命令 \cmd{array\-back\-slash} 以免出错% \footnote{\cmd{centering} 等对齐命令会破坏表格环境里 \crcmd\ 换行命令的定义， \cmd{array\-back\-slash} 用来恢复之。如果不加 \cmd{array\-back\-slash} 命令， 也可以用 \cmd{tabular\-newline} 命令代替原来的 \crcmd\ 实现表格换行。}： @@ -560,8 +563,9 @@ \pkgindex{tabularx} \envindex[tabularx]{tabularx} -\pkg{tabularx} 宏包为我们提供了方便的解决方案。它引入了一个 \texttt{X} 格式，类似 \texttt{p} 格式， -不过会根据表格宽度自动计算列宽，多个 \texttt{X} 格式平均分配列宽。\texttt{X} 格式也可以用 \pkg{array} 里的辅助格式修饰对齐方式： +\pkg{tabularx} 宏包为我们提供了方便的解决方案。它引入了一个 \texttt{X} 列格式，类似 \texttt{p} 列格式， +不过会根据表格宽度自动计算列宽，多个 \texttt{X} 列格式平均分配列宽。 +\texttt{X} 列格式也可以用 \pkg{array} 里的辅助格式修饰对齐方式： \begin{example} \begin{tabularx}{14em}% {|*{4}{>{\centering\arraybackslash}X|}} @@ -725,15 +729,15 @@ \begin{table}[htp] \centering \caption{各种编译方式支持的主流图片格式。}\label{tbl:figure-format} -\begin{tabular}{l>{\ttfamily}l>{\ttfamily}l} +\begin{tabular}{*{3}{l}} \hline - 格式 & 矢量图 & 位图 \\ + \textbf{格式} & \textbf{矢量图} & \textbf{位图} \\ \hline - \texttt{latex + dvipdfmx} & .eps & n/a \\ - \quad $\llcorner$（调用 \pkg{bmpsize} 宏包 ） & .eps .pdf & .jpg .png .bmp \\[.3\baselineskip] - \texttt{pdflatex} & .pdf & .jpg .png \\ - \quad $\llcorner$（调用 \pkg{epstopdf} 宏包） & .pdf .eps & .jpg .png \\[.3\baselineskip] - \texttt{xelatex} & .pdf .eps & .jpg .png .bmp \\ + \texttt{latex + dvipdfmx} & \texttt{.eps} & n/a \\ + \quad $\llcorner$（调用 \pkg{bmpsize} 宏包 ） & \texttt{.eps .pdf} & \texttt{.jpg .png .bmp} \\[.3\baselineskip] + \texttt{pdflatex} & \texttt{.pdf} & \texttt{.jpg .png} \\ + \quad $\llcorner$（调用 \pkg{epstopdf} 宏包） & \texttt{.pdf .eps} & \texttt{.jpg .png} \\[.3\baselineskip] + \texttt{xelatex} & \texttt{.pdf .eps} & \texttt{.jpg .png .bmp} \\ \hline \end{tabular} \begin{quote}\footnotesize @@ -760,18 +764,20 @@ \end{verbatim} \cmd{includegraphics} 命令的可选参数 \Arg{options} 支持 \Arg{key}=\Arg{value} 形式赋值，常用的参数如下： -\begin{center} +\begin{table}[htp] +\centering +\caption{\cmd{includegraphics} 命令的可选参数。}\label{tbl:graphics-options} \begin{tabular}{lp{18em}} \hline - 参数 & 含义 \\ + \textbf{参数} & \textbf{含义} \\ \hline - width=\Arg{width} & 将图片缩放到宽度为 \Arg{width} \\ - height=\Arg{height} & 将图片缩放到高度为 \Arg{height} \\ - scale=\Arg{scale} & 将图片相对于原尺寸缩放 \Arg{scale} 倍 \\ - angle=\Arg{angle} & 令图片逆时针旋转 \Arg{angle} 度 \\ + \texttt{width=}\Arg{width} & 将图片缩放到宽度为 \Arg{width} \\ + \texttt{height=}\Arg{height} & 将图片缩放到高度为 \Arg{height} \\ + \texttt{scale=}\Arg{scale} & 将图片相对于原尺寸缩放 \Arg{scale} 倍 \\ + \texttt{angle=}\Arg{angle} & 令图片逆时针旋转 \Arg{angle} 度 \\ \hline \end{tabular} -\end{center} +\end{table} \section{盒子}\label{sec:box} @@ -897,23 +903,27 @@ \Arg{placement} 参数提供了一些符号用来表示浮动体允许排版的位置，如 \texttt{hbp} 允许浮动体排版在当前位置、底部或者单独成页。 \env{table} 和 \env{figure} 浮动体的默认设置为 \texttt{tbp}。 -\begin{center} -\begin{tabular}{>{\ttfamily}lp{14em}} +\begin{table}[htp] +\centering +\caption{浮动体的位置参数。}\label{tbl:float-placement} +\begin{tabular}{*{2}{l}} \hline - h & 当前位置（代码所处的上下文） \\ - t & 顶部 \\ - b & 底部 \\ - p & 单独成页 \\[0.5ex] - ! & 在决定位置时忽视限制 \\ + \textbf{参数} & \textbf{含义} \\ + \hline + \texttt{h} & 当前位置（代码所处的上下文） \\ + \texttt{t} & 顶部 \\ + \texttt{b} & 底部 \\ + \texttt{p} & 单独成页 \\ + \texttt{!} & 在决定位置时忽视限制 \\ \hline \end{tabular} -\end{center} \begin{quote}\footnotesize 注 1：排版位置的选取与参数里符号的顺序无关，\LaTeX\ 总是以 \texttt{h-t-b-p} 的优先级顺序决定浮动体位置。 也就是说 \texttt{[!htp]} 和 \texttt{[ph!t]} 没有区别。\par 注 2：限制包括浮动体个数（除单独成页外，默认每页不超过 3 个浮动体，其中顶部不超过 2 个，底部不超过 1 个） 以及浮动体空间占页面的百分比（默认顶部不超过 70\%，底部不超过 30\%）。 \end{quote} +\end{table} \envindex{table*,figure*} 双栏排版环境下，\LaTeX\ 提供了 \env{table*} 和 \env{figure*} 环境用来排版跨栏的浮动体。 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.04.math.tex 2018-08-11 20:51:45.000000000 +0000 @@ -248,7 +248,7 @@ \caption{\LaTeX\ 作为算符的函数名称一览。}\label{tbl:math-functions} \begin{tabular}{*{5}{p{5em}}} \hline -\multicolumn{5}{c}{不带上下限的算符} \\ +\multicolumn{5}{c}{\textbf{不带上下限的算符}} \\ \hline \cmd{sin} & \cmd{arcsin} & \cmd{sinh} & \cmd{exp} & \cmd{dim} \\ \cmd{cos} & \cmd{arccos} & \cmd{cosh} & \cmd{log} & \cmd{ker} \\ @@ -256,7 +256,7 @@ \cmd{cot} & \cmd{arg} & \cmd{coth} & \cmd{ln} & \cmd{deg} \\ \cmd{sec} & \cmd{csc} & \\ \hline -\multicolumn{5}{c}{带上下限的算符} \\ +\multicolumn{5}{c}{\textbf{带上下限的算符}} \\ \hline \cmd{lim} & \cmd{limsup} & \cmd{liminf} & \cmd{sup} & \cmd{inf} \\ \cmd{min} & \cmd{max} & \cmd{det} & \cmd{Pr} & \cmd{gcd} \\ @@ -669,9 +669,9 @@ \begin{table}[htp] \centering \caption{数学字母字体。} \label{tbl:math-fonts} -\begin{tabular}{@{}*3l@{}} +\begin{tabular}{*{3}{l}} \hline -例子 & 命令 & 依赖的宏包\\ +\textbf{示例} & \textbf{命令} & \textbf{依赖的宏包}\\ \hline $\mathnormal{ABCDE abcde 1234}$ & \cmd{mathnormal}\marg*{\ldots}& \\ $\mathrm{ABCDE abcde 1234}$ & \cmd{mathrm}\marg*{\ldots} & \\ @@ -699,6 +699,8 @@ \caption{数学符号尺寸。}\label{tbl:math-size} \begin{tabular}{lll} \hline + \textbf{命令} & \textbf{尺寸} & \textbf{示例} \\ + \hline \cmd{displaystyle} & 行间公式尺寸 & $\displaystyle\sum a $\\ \cmd{textstyle} & 行内公式尺寸 & $\textstyle\sum a $ \\ \cmd{scriptstyle} & 上下标尺寸 & $\scriptstyle a$ \\ @@ -722,7 +724,7 @@ \subsection{加粗的数学符号}\label{subsec:math-bold} 在 \LaTeX\ 中为符号切换数学字体并不十分自由，只能通过 \cmd{mathbf} 等有限的命令切换字体。比如想得到粗斜体的符号，就没有现成的命令% -\footnote{国内可能还有使用粗斜体表示向量符号的习惯，但这并不是正确的习惯。}；再比如 \cmd{mathbf} 只能改变拉丁字母，希腊字母就没有用。 +\footnote{国内使用粗斜体符号表示矢量，见 GB3102-11.93。}；再比如 \cmd{mathbf} 只能改变拉丁字母，希腊字母就没有用。 \cmdindex{boldmath} \LaTeX\ 提供了一个命令 \cmd{boldmath} 令用户可以将整套数学字体切换为粗体版本。但这个命令\textbf{只能在公式外使用}： diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.05.style.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.05.style.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.05.style.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.05.style.tex 2018-08-11 20:51:45.000000000 +0000 @@ -34,7 +34,7 @@ \begin{table}[htp] \caption{字体命令。} \label{tbl:fonts} \centering -\begin{tabular}{@{}rrcc@{}} +\begin{tabular}{*{4}{l}} \hline \cmd{rmfamily}\cmdindex{rmfamily} & \cmd{textrm}\cmdindex{textrm}\marg*{\ldots} & \textrm{roman} & 衬线字体（罗马体）\\ \cmd{sffamily}\cmdindex{sffamily} & \cmd{textsf}\cmdindex{textsf}\marg*{\ldots} & \textsf{sans serif} & 无衬线字体 \\ @@ -59,7 +59,7 @@ \begin{table}[htp] \centering \caption{字号。} \label{tbl:sizes} -\begin{tabular}{@{}ll} +\begin{tabular}{ll} \hline \cmd{tiny}\cmdindex{tiny} & \tiny tiny font \\ \cmd{scriptsize}\cmdindex{scriptsize} & \scriptsize very small font\\ @@ -82,9 +82,10 @@ \begin{table}[htp] \centering \caption{标准文档类中的字号大小。}\label{tbl:ptsizes} -\begin{tabular}{lrrr} +\begin{tabular}{*{4}{l}} +\hline +\textbf{字号} & \textbf{10pt 选项（默认）} & \textbf{11pt 选项} & \textbf{12pt 选项} \\ \hline -字号 & 10pt 选项（默认）& 11pt 选项 & 12pt 选项 \\ \cmd{tiny}\cmdindex{tiny} & 5pt & 6pt & 6pt\\ \cmd{scriptsize}\cmdindex{scriptsize} & 7pt & 8pt & 8pt\\ \cmd{footnotesize}\cmdindex{footnotesize} & 8pt & 9pt & 10pt \\ @@ -139,11 +140,11 @@ 常见的正文字体编码有 \texttt{OT1} 和 \texttt{T1} 等。\LaTeX\ 默认使用对原始 \TeX\ 兼容的 \texttt{OT1} 编码，使用起来有诸多限制： 高德纳在设计 Computer Modern 字体时认为一些符号，如大于号、小于号等，原则上都应该在公式里出现，所以在正文字体（\cmd{rmfamily} 或 \cmd{sffamily}）里， 这些符号所在的位置被其它符号所占据（事实上用户输入 \texttt< 和 \texttt> 得到的是\ !` 和\ ?` 两个倒立的标点符号， -正常的大于号和小于号可用命令 \cmd{textgreater} 和 \cmd{textless} 输入；\cmd{ttfamily} 字体下基本上是正常的）。 +正常的大于号和小于号可用命令 \cmd{textgreater} 和 \cmd{textless} 输入；等宽字体（\cmd{ttfamily}）里是正常的大于号和小于号）。 扩展的 \texttt{T1} 编码则对 ASCII 字符的兼容好得多，不会出现上述的大于号、小于号的问题。 \texttt{T1} 编码配合一些字体宏包如 \pkg{txfonts}、\pkg{lmodern} 等，还能够令用户使用 \cmd{textasciitilde} 命令 -输入位置居中的连字符 a\textasciitilde b，相比数学符号 \texttt\$\cmd{sim}\texttt\$ 来得合理一些。 +输入位置居中的波浪号，比如表示近似的用法 \textasciitilde 24，相比数学符号 \texttt\$\cmd{sim}\texttt\$ 来得合理一些。 \pkgindex{fontenc} 切换字体编码要用到 \pkg{fontenc} 宏包： @@ -151,15 +152,16 @@ \usepackage[T1]{fontenc} \end{verbatim} -\pkg{fontenc} 宏包是用来配合传统的 \LaTeX\ 字体的，如表 \ref{tbl:font-pkgs} 中的大部分宏包。如果使用下文的 \pkg{fontspec} +\pkg{fontenc} 宏包是用来配合传统的 \LaTeX\ 字体的，如表 \ref{tbl:font-pkgs} 中的一些传统宏包。如果使用下文的 \pkg{fontspec} 宏包调用 \texttt{ttf} 或 \texttt{otf} 格式字体，就不要再使用 \pkg{fontenc} 宏包。 +使用表 \ref{tbl:font-pkgs} 中的字体宏包之前最好查看一下宏包的帮助手册，了解使用方法和注意事项。 \begin{table}[!p] \centering \caption{常见的 \LaTeX\ 字体宏包。}\label{tbl:font-pkgs} -\begin{tabularx}{\linewidth}{cX} +\begin{tabular}{lp{30em}} \hline - \multicolumn{2}{c}{文本/数学字体搭配的宏包} \\ + \multicolumn{2}{c}{\textbf{文本 / 数学字体搭配的宏包}} \\ \hline \pkg{lmodern} & Latin Modern 字体，对 Computer Modern 字体的扩展 \\ \pkg{cmbright} & 仿 Computer Modern 风格的无衬线字体 \\ @@ -175,10 +177,10 @@ \pkg{fourier} & fourier 风格数学字体，配合 Utopia 正文字体 \\ \pkg{fouriernc} & fourier 风格数学字体，配合 New Century Schoolbook 正文字体 \\ \pkg{arev} & Arev 无衬线字体宏包，Vera Sans 风格 \\ - \pkg{mathdesign} & 配合 Charter/Garamond/Utopia 正文字体的数学字体宏包（Garamond 字体可能需要单独安装） \\ + \pkg{mathdesign} & 配合 Charter / Garamond / Utopia 正文字体的数学字体宏包（Garamond 字体可能需要单独安装） \\ \hline - \multicolumn{2}{c}{文本字体宏包} \\ - \multicolumn{2}{l}{\small 以下字体包括传统的 \LaTeX\ 字体格式以及 TrueType / OpenType 格式。} \\ + \multicolumn{2}{c}{\textbf{文本字体宏包}} \\ + \multicolumn{2}{l}{\footnotesize 以下字体包括传统的 \LaTeX\ 字体格式以及 TrueType / OpenType 格式。} \\ \hline \pkg{dejavu} & DejaVu 开源字体 \\ \pkg{droid} & Droid 开源字体 \\ @@ -188,14 +190,14 @@ \pkg{sourcesanspro} & Source Sans Pro 开源无衬线字体 \\ \pkg{sourcecodepro} & Source Code Pro 开源等宽字体 \\ \hline - \multicolumn{2}{c}{符号宏包} \\ + \multicolumn{2}{c}{\textbf{符号宏包}} \\ \hline \pkg{mathabx} & 数学符号宏包之一 \\ - \pkg{MnSymbol} & 数学符号宏包之一 \\ + \pkg{MnSymbol} & 数学符号宏包之一，配合 Minion Pro 文本字体 \\ \pkg{fdsymbol} & 数学符号宏包之一 \\ - \pkg{pifont} & Zapf Dingbats 符号字体宏包 \\ + \pkg{pifont} & Zapf Dingbats 符号宏包 \\ \hline -\end{tabularx} +\end{tabular} \end{table} \subsection{使用 \pkg{fontspec} 宏包更改字体 (\texttt{xelatex})}\label{subsec:fontspec} @@ -244,12 +246,14 @@ 在前面的一些章节，我们已经见到一些长度和长度变量的用法。本节首先统一介绍长度和长度变量。 -长度的数值 \Arg{length} 由数字和单位组成。常用的单位如下： +长度的数值 \Arg{length} 由数字和单位组成。常用的单位见表 \ref{tbl:length-unit}。 \def\unitindex#1{\index{#1@\texttt{#1} (\textit{长度单位})}} -\begin{center} -\begin{tabular}{cl} +\begin{table}[htp] +\centering +\caption{\TeX\ / \LaTeX\ 中的长度单位。}\label{tbl:length-unit} +\begin{tabular}{ll} \hline \texttt{pt}\unitindex{pt} & 点阵宽度，1/72.27\texttt{in} \\ \texttt{bp}\unitindex{bp} & 点阵宽度，1/72\texttt{in} \\ @@ -261,7 +265,7 @@ \texttt{ex}\unitindex{ex} & 当前字号下小写字母 x 的高度，常用于垂直距离的设定 \\ \hline \end{tabular} -\end{center} +\end{table} 在一些情况下还会用到可伸缩的“弹性长度”，如 \texttt{12pt plus 2pt minus 3pt} 表示基础长度为 \texttt{12pt}，可以伸展到 \texttt{14pt} ，也可以收缩到 \texttt{9pt}。 @@ -575,8 +579,8 @@ \begin{table}[htp] \centering -\caption{\LaTeX\ 预定义的页眉页脚样式}\label{tbl:pagestyle} -\begin{tabularx}{0.8\textwidth}{lX} +\caption{\LaTeX\ 预定义的页眉页脚样式。}\label{tbl:pagestyle} +\begin{tabular}{lp{30em}} \hline \texttt{empty} & 页眉页脚为空 \\ \texttt{plain} & 页眉为空，页脚为页码。（\cls{article} 和 \cls{report} 文档类默认；\cls{book} 文档类的每章第一页也为 plain 格式） \\ @@ -584,7 +588,7 @@ \texttt{headings} & 页眉为章节标题和页码，页脚为空。（\cls{book} 文档类默认） \\ \texttt{myheadings} & 页眉为页码及 \cmd{markboth} 和 \cmd{markright} 命令手动指定的内容，页脚为空。\\ \hline -\end{tabularx} +\end{tabular} \end{table} \clsindex{article,report,book} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.06.spec.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.06.spec.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.06.spec.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.06.spec.tex 2018-08-11 20:51:45.000000000 +0000 @@ -75,10 +75,10 @@ 我们在此简单列举学术论文里使用较多的 \hologo{BibTeX} 文献条目类别： \begin{description} - \item[\texttt{article}] 学术论文，必需数据项有 author, title, journal, year; 可选数据项包括 volumn, number, pages, doi 等； - \item[\texttt{book}] 书籍，必需数据项有 author/editor, title, publisher, year; 可选数据项包括 volumn/number, series, address 等； - \item[\texttt{incollection}] 论文集中的一篇，必需数据项有 author, title, booktitle, publisher, year; 可选数据项包括 editor, volumn/number, chapter, pages, address 等； - \item[\texttt{inbook}] 书中的一章，必需数据项有 author/editor, title, chapter/pages, publisher, year; 可选数据项包括 volumn/number, series, address 等。 + \item[\texttt{article}] 学术论文，必需数据项有 author, title, journal, year; 可选数据项包括 volume, number, pages, doi 等； + \item[\texttt{book}] 书籍，必需数据项有 author/editor, title, publisher, year; 可选数据项包括 volume/number, series, address 等； + \item[\texttt{incollection}] 论文集中的一篇，必需数据项有 author, title, booktitle, publisher, year; 可选数据项包括 editor, volume/number, chapter, pages, address 等； + \item[\texttt{inbook}] 书中的一章，必需数据项有 author/editor, title, chapter/pages, publisher, year; 可选数据项包括 volume/number, series, address 等。 \end{description} 例如 \texttt{article} 类别的参考文献数据条目写法如下： @@ -278,30 +278,30 @@ \begin{table}[tp] \centering \caption{索引项的写法列表。}\label{tbl:index-entry} -\begin{tabular}{@{}lll@{}} +\begin{tabular}{lll} \hline \textbf{举例} &\textbf{索引项} &\textbf{备注}\\ \hline - \multicolumn{3}{@{}l@{}}{普通索引} \\ + \multicolumn{3}{l}{普通索引} \\[.8ex] \verb+hello+ & hello, 1 & 普通索引 \\ \hline - \multicolumn{3}{@{}l@{}}{分级索引，以 \texttt! 分隔，最多支持三级} \\ + \multicolumn{3}{l}{分级索引，以 \texttt! 分隔，最多支持三级} \\[.8ex] \verb+hello+ & hello, 1 & 一级索引 \\ \verb+hello!Peter+ &\quad Peter, 3 & 二级索引 \\ \verb+hello!Peter!Jack+ &\qquad Jack, 3 & 三级索引 \\ \hline - \multicolumn{3}{@{}l@{}}{格式化索引，形式为 \Arg{alpha}\texttt @\Arg{format}} \\ - \multicolumn{3}{@{}l@{}}{\Arg{alpha}为纯字母，用来排序} \\ - \multicolumn{3}{@{}l@{}}{\Arg{format}为索引的格式，可以包括 \LaTeX 代码和简单的公式} \\ + \multicolumn{3}{l}{格式化索引，形式为 \Arg{alpha}\texttt @\Arg{format}} \\ + \multicolumn{3}{l}{\Arg{alpha}为纯字母，用来排序} \\ + \multicolumn{3}{l}{\Arg{format}为索引的格式，可以包括 \LaTeX 代码和简单的公式} \\[.8ex] \verb+Mobius@M\""obius+ & M\"obius, 2 & 输出重音 \\ \verb+alpha@$\alpha$+ & $\alpha$, 7 & 输出公式 \\ \verb+bold@\textbf{bold}+ & \textbf{bold}, 12 & 输出粗体 \\ \hline - \multicolumn{3}{@{}l@{}}{页码范围} \\ + \multicolumn{3}{l}{页码范围} \\[.8ex] \verb+morning|(+ & morning, 6-7 & 范围索引的开头 \\ \verb+morning|)+ & & 范围索引的结尾 \\ \hline - \multicolumn{3}{@{}l@{}}{格式化索引页码} \\ + \multicolumn{3}{l}{格式化索引页码} \\[.8ex] \verb+Jenny|textbf+ & Jenny, \textbf{3} & 调用 \cmd{textbf} 加粗页码 \\ \verb+Joe|see{Jenny}+ & Joe, \textit{see} Jenny & 调用 \cmd{see} 生成特殊形式 \\ \verb+Joe|seealso{Jenny}+ & Joe, \textit{see also} Jenny & 调用 \cmd{seealso} 生成特殊形式 \\ @@ -466,9 +466,9 @@ \begin{table}[htp] \centering \caption{\pkg{hyperref} 宏包提供的参数设置。}\label{tbl:hyperref-settings} -\begin{tabular}{lcp{19.5em}} +\begin{tabular}{llp{19.5em}} \hline - 参数 & 默认值 & \multicolumn{1}{c}{含义} \\ + \textbf{参数} & textbf{默认值} & \textbf{含义} \\ \hline \texttt{colorlinks=}\Arg{true\textnormal|false} & \textit{false} & 设置为 \textit{true} 为链接文字带颜色，反之加上带颜色的边框 \\ @@ -483,9 +483,9 @@ \texttt{bookmarksnumbered=}\Arg{true\textnormal|false} & \textit{false} & 书签是否带章节编号 \\ \texttt{CJKbookmarks=}\Arg{true\textnormal|false} - & \textit{false} & 使用 \pkg{CJK} 宏包/ GBK 编码排版中文时必须设定的参数， - 在第一次编译后需要将生成的 \texttt{.out} 文件用工具处理编码 \\ - \texttt{unicode} & & 使用 \pkg{CJKutf8} 宏包/ UTF-8 编码排版中文时必须设定的参数 \\ + & \textit{false} & 使用 \pkg{CJK} 宏包/ GBK 编码排版中文时必须设定的参数， + 需要将生成的 \texttt{.out} 文件用工具处理编码，或调用 \pkg{xCJK2uni} 宏包 \\ + \texttt{unicode} & & 使用 \pkg{CJKutf8} 宏包/ UTF-8 编码排版中文时必须设定的参数 \\ \hline \texttt{pdftitle=}\Arg{string} & 空 & 标题 \\ @@ -576,4 +576,4 @@ \pkg{hyperref} 宏包还提供了一些参数用于改变 PDF 文档的属性，部分见表 \ref{tbl:hyperref-settings}。 -\endinput \ No newline at end of file +\endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.08.custom.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.08.custom.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.08.custom.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/chap.08.custom.tex 2018-08-11 20:51:45.000000000 +0000 @@ -200,10 +200,12 @@ \cmdindex{arabic,alph,Alph,roman,Roman,fnsymbol} 命令 \cmd{Alph} 控制计数器 \Arg{counter} 的值以大写字母形式显示。下表列出所有可用于修改计数器格式的命令。 注意：这些命令\textbf{只能用于计数器，不能直接用于数字}，如 \cmd{roman}\marg*{1} 这样的命令会出错。 -\begin{center} +\begin{table}[htp] +\centering +\caption{计数器输出格式相关命令。}\label{tbl:counter-commands} \begin{tabular}{lp{12em}l} \hline - \textbf{命令} & \textbf{样式} & \textbf{备注} \\ + \textbf{命令} & \textbf{样式} & \textbf{范围} \\ \hline \cmd{arabic} & 阿拉伯数字（默认） & \\ \cmd{alph} & 小写字母 & 限 0-26 \\ @@ -213,7 +215,7 @@ \cmd{fnsymbol} & 一系列符号，用于 \cmd{thanks} 命令生成的脚注 & 限 0-9 \\ \hline \end{tabular} -\end{center} +\end{table} 计数器的输出格式还可以利用其它字符，甚至其它计数器的输出格式与之组合。如标准文档类里对 \cmd{sub\-section} 相关的计数器的输出格式的定义相当于： \begin{verbatim} @@ -288,9 +290,9 @@ \centering \caption{\LaTeX\ 可定制的标题名称/前后缀。}\label{tbl:latex-settings-names} \small -\begin{tabularx}{\textwidth}{llX} +\begin{tabular}{llp{24em}} \hline - \textsf{命令} & \textsf{默认值} & \textsf{含义} \\ + \textbf{命令} & \textbf{默认值} & \textbf{含义} \\ \hline \cmd{partname} & Part & \cmd{part} 命令生成的标题前缀 \\ \cmd{chaptername} & Chapter & \cmd{chapter} 命令生成的标题前缀 \\ @@ -307,7 +309,7 @@ 命令生成的参考文献标题（\cls{book / report} 文档类）\\ \cmd{indexname} & Index & \cmd{printindex} 命令生成的索引标题 \\ \hline -\end{tabularx} +\end{tabular} \begin{quotation}\footnotesize% 注：形如“第 X 章”和“第 X 部分”的中文章节标题不能直接由修改本表的命令得到，需要使用 \pkg{titlesec} 等宏包定制。 如果使用 \pkg{ctex} 宏包或文档类，那么标题默认被修改成“第 X 章”和“第 X 部分”的形式，本表中的其它标题也修改为中文标题。详见 \pkg{ctex} 宏包的帮助手册。 @@ -318,22 +320,22 @@ \centering \caption{\LaTeX\ 可定制的长度参数。}\label{tbl:latex-settings-lengths} \small -\begin{tabularx}{\textwidth}{ll@{pt\hskip2\tabcolsep}X} +\begin{tabular}{lll} \hline - \textsf{命令} & \multicolumn{1}{l@{\hskip2\tabcolsep}}{\textsf{默认值}} & \textsf{含义} \\ + \textbf{命令} & \textbf{默认值} & \textbf{含义} \\ \hline - \cmd{fboxrule} & 0.4 & \cmd{fbox} 或 \cmd{framebox} 等带框盒子的线宽 \\ - \cmd{fboxsep} & 3 & \cmd{fbox} 或 \cmd{framebox} 等带框盒子的内边距 \\[1ex] - \cmd{arraycolsep} & 5 & \env{array} 环境的表格项前后的间距 \\ - \cmd{tabcolsep} & 6 & \env{tabular} 环境的表格项前后的间距 \\ - \cmd{arrayrulewidth} & 0.4 & 表格线宽 \\ - \cmd{doublerulesep} & 2 & 连续两根表格线之间的间距 \\[1ex] - \cmd{abovecaptionskip} & 10 & \cmd{caption} 命令位于图表下方时，与上方图表的间距 \\ - \cmd{belowcaptionskip} & 0 & \cmd{caption} 命令位于图表上方时，与下方图表的间距 \\[1ex] - \cmd{columnsep} & 10 & 双栏排版下两栏的间距 \\ - \cmd{columnseprule} & 0 & 双栏排版下两栏之间竖线的宽度 \\ + \cmd{fboxrule} & 0.4pt & \cmd{fbox} 或 \cmd{framebox} 等带框盒子的线宽 \\ + \cmd{fboxsep} & 3pt & \cmd{fbox} 或 \cmd{framebox} 等带框盒子的内边距 \\[1ex] + \cmd{arraycolsep} & 5pt & \env{array} 环境的表格项前后的间距 \\ + \cmd{tabcolsep} & 6pt & \env{tabular} 环境的表格项前后的间距 \\ + \cmd{arrayrulewidth} & 0.4pt & 表格线宽 \\ + \cmd{doublerulesep} & 2pt & 连续两根表格线之间的间距 \\[1ex] + \cmd{abovecaptionskip} & 10pt & \cmd{caption} 命令位于图表下方时，与上方图表的间距 \\ + \cmd{belowcaptionskip} & 0pt & \cmd{caption} 命令位于图表上方时，与下方图表的间距 \\[1ex] + \cmd{columnsep} & 10pt & 双栏排版下两栏的间距 \\ + \cmd{columnseprule} & 0pt & 双栏排版下两栏之间竖线的宽度 \\ \hline -\end{tabularx} +\end{tabular} \begin{quotation}\footnotesize% 注：\cmd{arraycolsep} 和 \cmd{tabcolsep} 是每个表格项本身前后的间距（表格线前后无间距；\texttt{@} 列格式会消除与前后表格项的间距）。 两个表格项之间的间距相当于 2\cmd{arraycolsep} 或 2\cmd{tabcolsep}。 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.overview.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.overview.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.overview.tex 2016-11-25 18:29:25.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/preface.overview.tex 2018-08-11 20:51:45.000000000 +0000 @@ -46,8 +46,8 @@ \bigskip \begin{flushright} -鲁尚文 \\ -\mailto|louisstuart96@gmail.com| +C\TeX\ 开发小组\par +\url{https://github.com/CTeX-org} \end{flushright} \vfill diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/sec.symbol.table.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/sec.symbol.table.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/sec.symbol.table.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/sec.symbol.table.tex 2018-08-11 20:51:45.000000000 +0000 @@ -35,7 +35,7 @@ \begin{table}[htp] \centering -\caption{文本/数学模式通用符号}\label{tbl:general-syms} +\caption{文本/数学模式通用符号。}\label{tbl:general-syms} \begin{quote}\footnotesize% 这些符号可用于文本和数学模式。 \end{quote} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/titlepage.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/titlepage.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/chap/titlepage.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/chap/titlepage.tex 2018-08-11 20:51:45.000000000 +0000 @@ -16,7 +16,7 @@ {\bfseries 原版作者：} Tobias Oetiker\\ Hubert Partl, Irene Hyna and Elisabeth Schlegl \\ {\bfseries 原版版本：} Version~\lshortversionoriginal, July 18, 2015\\[4ex] - {\bfseries 中文翻译：} China\TeX\ 论坛\\ + {\bfseries 中文翻译：} C\TeX\ 开发小组 \\ {\bfseries 中文版本：} 版本~\lshortversioncn，\zhdigits*{\the\year}年\zhnumber{\the\month}月 \end{minipage}% } @@ -25,7 +25,7 @@ \newpage\thispagestyle{empty} \begin{quote}\footnotesize - Copyright \copyright{} 2016 Louis Stuart. \\ + Copyright \copyright{} {\the\year} Chinese \TeX\ Society. \\ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn-style.sty 2018-08-11 20:51:45.000000000 +0000 @@ -20,6 +20,7 @@ % ctex 宏包的字号设定会让许多固定字号的字体宏包报太多 warning，应当抑制 % 中文正文字体使用 Fandol % +\PassOptionsToPackage{no-math}{fontspec} \RequirePackage[fontset=fandol,zihao=false,scheme=chinese,heading=true]{ctex}[2015/06/24] % diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/lshort-zh-cn.tex 2018-08-11 20:51:45.000000000 +0000 @@ -2,7 +2,7 @@ \usepackage{lshort-zh-cn-style} \def\lshortversionoriginal{5.05} -\def\lshortversioncn{5.10} +\def\lshortversioncn{5.11} \hypersetup{% pdftitle={The Not So Short Introduction to LaTeX2e(Chinese Simplified)},% @@ -29,7 +29,6 @@ \input{chap/preface.contrib} \input{chap/preface.overview} \tableofcontents -%\listofsources \mainmatter \input{chap/chap.01.basics} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/make.bat texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/make.bat --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/make.bat 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/make.bat 2018-08-11 20:51:45.000000000 +0000 @@ -15,11 +15,17 @@ %TEX% %MODE% %LSHORT% if exist %PDF% ( -move %PDF% .. -start "" "..\%PDF%" +copy %PDF% .. ) exit :clean del %TEMP% +del %PDF% +exit + +:distclean +del %TEMP% +del %PDF% +del ..\%PDF% exit diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/Makefile texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/Makefile --- texlive-lang-2018.20180725/texmf-dist/doc/latex/lshort-chinese/src/Makefile 2017-03-26 21:46:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/lshort-chinese/src/Makefile 2018-08-11 20:51:45.000000000 +0000 @@ -8,7 +8,7 @@ MAKEIDX = makeindex RM = rm -f -INSTALL = mv +INSTALL = cp all: $(PDF) @@ -22,7 +22,7 @@ $(INSTALL) $(LSHORT).pdf .. clean: - $(RM) $(TEMP) + $(RM) $(TEMP) $(LSHORT).pdf distclean: clean $(RM) ../$(LSHORT).pdf diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/LICENSE texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/LICENSE --- texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/LICENSE 2018-08-21 21:51:42.000000000 +0000 @@ -0,0 +1,27 @@ +Copyright (c) 2018 Hironobu Yamashita +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* 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 -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/Makefile texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/Makefile --- texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/Makefile 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/Makefile 2018-08-21 21:51:42.000000000 +0000 @@ -0,0 +1,26 @@ +KANJI = -kanji=utf8 +FONTMAP = -f ipaex.map -f ptex-ipaex.map +TEXMF = $(shell kpsewhich -var-value=TEXMFHOME) + +all: plautopatch.pdf plautopatch-ja.pdf + +.SUFFIXES: .tex .dvi .pdf +.tex.dvi: + platex $(KANJI) $< + platex $(KANJI) $< + rm *.aux *.log +.dvi.pdf: + dvipdfmx $(FONTMAP) $< + +.PHONY: install clean +install: + mkdir -p ${TEXMF}/doc/platex/plautopatch + cp ./Makefile ${TEXMF}/doc/platex/plautopatch/ + cp ./LICENSE ${TEXMF}/doc/platex/plautopatch/ + cp ./README.md ${TEXMF}/doc/platex/plautopatch/ + cp ./*.pdf ${TEXMF}/doc/platex/plautopatch/ + cp ./*.tex ${TEXMF}/doc/platex/plautopatch/ + mkdir -p ${TEXMF}/tex/platex/plautopatch + cp ./*.sty ${TEXMF}/tex/platex/plautopatch/ +clean: + rm -f *.dvi *.pdf Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch-ja.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch-ja.tex 2018-08-22 21:30:14.000000000 +0000 @@ -0,0 +1,131 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle} +\usepackage{doc} +\usepackage{plautopatch}% load this here to make \GetFileInfo work +\GetFileInfo{plautopatch.sty} +\title{Package \textsf{plautopatch} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +日本のp\LaTeX/up\LaTeX{}フォーマットや専用パッケージが、 +これらを知らない\LaTeX{}パッケージ（しばしば海外で作られた +汎用のもの）と衝突することがあります。 +最悪の場合にはエラーが出たり、誤った出力が得られたり +することがあります。 + +この\textsf{plautopatch}の目的は、こうした非互換を意識せずに +済むようにすることです。具体的には、p\LaTeX/up\LaTeX{}と +衝突するパッケージが使われた場合に、その衝突を解消するパッチを +提供するパッケージを必要に応じて自動的に読み込みます。 +こうすることで、ソースコードを簡潔にできるだけでなく、 +p\LaTeX/up\LaTeX{}で動作するソースと通常の\LaTeX{}ソースの +見た目を近づけることができます。 + +このパッケージはGitHubで開発しています。 +\begin{verbatim} + https://github.com/aminophen/plautopatch +\end{verbatim} + +\section*{動作条件} + +このパッケージは +\textsf{filehook}パッケージ（Martin Scharrer氏の作）に依存します。 + +\section*{使い方} + +このパッケージを\LaTeX{}ソースの冒頭で読み込みます。 +このために、\verb+\RequirePackage{plautopatch}+を +\verb+\documentclass+や他のコマンドよりも\emph{前}に +読み込むことをお勧めします +（クラスファイルなどが問題のあるパッケージを読み込む可能性もあるため）。 + +例を示します。 +\begin{verbatim} + %\RequirePackage{plautopatch} + \documentclass{tarticle}% 縦組クラス（plext使用） + \usepackage{array}% plextと非互換 + \begin{document} + ... + \end{document} +\end{verbatim} +上記の例では、 +\textsf{tarticle}クラスが内部で読み込む\textsf{plext}パッケージと、 +ソース中で\verb+\usepackage+している\textsf{array}パッケージが +衝突してエラーになる場合があります。しかし、冒頭で +\verb+\RequirePackage{plautopatch}+とだけ書いておけば、 +\textsf{array}パッケージの時点で\textsf{plextarray}パッケージが +追加で読み込まれるため、問題が解消します。 +このように自動追加されたパッケージは、\verb+\end{document}+の +時点で次のように一覧として表示されます（複数の場合は +コンマと空白で区切ったリストになります）。 +\begin{verbatim} +***** List of packages loaded by `plautopatch': ***** + plextarray. +***************************************************** +\end{verbatim} + +\section*{現在対応しているパッケージの一覧} + +\def\ITEMoo#1 (#2) -> #3 (#4){% + \item \textsf{#1} (\textsf{#2})\\ + $\rightarrow$ \textsf{#3} (\textsf{#4})} +\def\ITEMooo#1 (#2) + #3 (#4) -> #5 (#6){% + \item \textsf{#1} (\textsf{#2}) + \textsf{#3} (\textsf{#4})\\ + $\rightarrow$ \textsf{#5} (\textsf{#6})} +\def\ITEM#1 -> #2 {% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} } + +凡例： +\begin{itemize} +\item \texttt{<元のパッケージ>} (\texttt{<元が含まれるバンドル名>})\\ + \texttt{<パッチのパッケージ>} (\texttt{<パッチが含まれるバンドル名>}) +\end{itemize} + +現在のバージョン (\filedate\space\fileversion) がサポートしているのは +下記のパッケージです。 +\begin{itemize} +\ITEMoo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) +\ITEMoo fltrace (latex) -> pfltrace (platex) +\ITEMoo array (latex-tools) -> plarray (platex-tools) +\ITEMooo array (latex-tools) + plext (platex) -> plextarray (platex-tools) +\ITEMooo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) +\ITEMoo everysel (ms) -> pxeverysel (platex-tools) +\ITEMoo everyshi (ms) -> pxeveryshi (platex-tools) +\ITEMoo atbegshi (oberdiek) -> pxatbegshi (platex-tools) +\ITEMoo ftnright (latex-tools) -> pxftnright (platex-tools) +\ITEM pdfpages -> pxpdfpages (maintained here!) +\end{itemize} +もちろん、このリストは随時、追加・削除・置き換えていく予定です。 +互換性の問題や追加したいパッケージがある場合はご一報ください。 + +\section*{特定のパッケージを除外したい場合} + +デフォルトでは、上記のリストに登録されている\texttt{<元のパッケージ>}が +使われたことを検出すると、全て自動的にパッチを読み込みます。 +しかし、時にはこれが逆効果となり、問題が起きる可能性は否定できません。 +そのような場合は +\begin{verbatim} + \plautopatchdisable{<元のパッケージ>} +\end{verbatim} +と書くことで、そのパッケージを検出対象から除外します。複数ある場合は +\begin{verbatim} + \plautopatchdisable{<元のパッケージ1>,<元のパッケージ2>} +\end{verbatim} +のようにコンマで区切っていくつでも除外できます。 + +\section*{変更履歴} + +\begin{itemize} + \item 2018/08/21 v0.2 最初のCTANリリース版 + \item 2018/08/22 v0.3 元パッケージ検出の改良 +\end{itemize} + +\end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch.tex texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch.tex --- texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/plautopatch.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/plautopatch.tex 2018-08-22 21:30:14.000000000 +0000 @@ -0,0 +1,133 @@ +%# -*- coding: utf-8 -*- +\ifx\epTeXinputencoding\undefined\else % defined in e-pTeX (> TL2016) + \epTeXinputencoding utf8 % ensure utf-8 encoding for platex +\fi + +\documentclass[a4paper]{jsarticle} +\usepackage{doc} +\usepackage{plautopatch}% load this here to make \GetFileInfo work +\GetFileInfo{plautopatch.sty} +\title{Package \textsf{plautopatch} \fileversion} +\author{Hironobu Yamashita} +\date{\filedate} +\begin{document} + +\maketitle + +Japanese \pLaTeX/up\LaTeX\ formats and packages often conflict +with other \LaTeX\ packages which are unaware of p\LaTeX/up\LaTeX. +In the worst case, such packages throw a fatal error or +end up with a wrong output. + +The goal of this package \textsf{plautopatch} is that +there should be no need to worry about such incompatibilities, +because specific patches are loaded automatically +whenever necessary. +This helps not only to simplify source files, but also +to make the appearance of working p\LaTeX/up\LaTeX\ sources +similar to those of ordinally \LaTeX\ ones. + +The package is maintained on GitHub: +\begin{verbatim} + https://github.com/aminophen/plautopatch +\end{verbatim} + +\section*{Requirements} + +This package depends on \textsf{filehook} package, +written by Martin Scharrer. + +\section*{Usage} + +Load this package at the very beginning of the \LaTeX\ source. +It is strongly recommended to use +\verb+\RequirePackage{plautopatch}+ +before \verb+\documentclass+ or any other commands, +as such other classes and packages may load +some problematic packages internally. + +Here is an example: +\begin{verbatim} + %\RequirePackage{plautopatch} + \documentclass{tarticle}% vertical writing (requires plext) + \usepackage{array}% incompatible with plext + \begin{document} + ... + \end{document} +\end{verbatim} +In the above example, the class \textsf{tarticle} internally +requires the package \textsf{plext}. +However, \textsf{array} explicitly required by \verb+\usepackage+ +conflicts with \textsf{plext}. +By using \verb+\RequirePackage{plautopatch}+, +\textsf{plextarray} is automatically loaded and the problem goes. +The list of automatically-loaded packages is shown at +\verb+\end{document}+: +\begin{verbatim} +***** List of packages loaded by `plautopatch': ***** + plextarray. +***************************************************** +\end{verbatim} +When multiple packages are loaded, they are all printed +as a list separated by commas and spaces. + +\section*{List of currently available patches} + +\def\ITEMoo#1 (#2) -> #3 (#4){% + \item \textsf{#1} (\textsf{#2})\\ + $\rightarrow$ \textsf{#3} (\textsf{#4})} +\def\ITEMooo#1 (#2) + #3 (#4) -> #5 (#6){% + \item \textsf{#1} (\textsf{#2}) + \textsf{#3} (\textsf{#4})\\ + $\rightarrow$ \textsf{#5} (\textsf{#6})} +\def\ITEM#1 -> #2 {% + \item \textsf{#1}\\ + $\rightarrow$ \textsf{#2} } + +The legend: +\begin{itemize} +\item \texttt{} (\texttt{})\\ + \texttt{} (\texttt{}) +\end{itemize} + +Current version (\filedate\space\fileversion) supports the followings: +\begin{itemize} +\ITEMoo tracefnt (latex) -> ptrace/uptrace (platex/uplatex) +\ITEMoo fltrace (latex) -> pfltrace (platex) +\ITEMoo array (latex-tools) -> plarray (platex-tools) +\ITEMooo array (latex-tools) + plext (platex) -> plextarray (platex-tools) +\ITEMooo delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) +\ITEMoo everysel (ms) -> pxeverysel (platex-tools) +\ITEMoo everyshi (ms) -> pxeveryshi (platex-tools) +\ITEMoo atbegshi (oberdiek) -> pxatbegshi (platex-tools) +\ITEMoo ftnright (latex-tools) -> pxftnright (platex-tools) +\ITEM pdfpages -> pxpdfpages (maintained here!) +\end{itemize} +Note that, of course, the list may be adjusted +(addition, deletion or replacement) +in the future to get the expected result. +Feel free to report some compatibility issue or request changes! + +\section*{Disabling a specific patch} + +By default, \texttt{} is automatically loaded when +\texttt{} is detected, following the whole list. +However, there is still a possibility of another regression issue. +In that case, you can disable the detection of +\texttt{} by using the command: +\begin{verbatim} + \plautopatchdisable{} +\end{verbatim} +If you want to disable multiple packages, you can give +a comma-separated list of them: +\begin{verbatim} + \plautopatchdisable{,} +\end{verbatim} + +\section*{Change History} + +\begin{itemize} + \item 2018/08/21 v0.2 First CTAN release + \item 2018/08/22 v0.3 Improve detection of problematic packages +\end{itemize} + +\end{document} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/README.md texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/latex/plautopatch/README.md 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/latex/plautopatch/README.md 2018-08-22 21:30:14.000000000 +0000 @@ -0,0 +1,63 @@ +# plautopatch + +Japanese pLaTeX/upLaTeX formats and packages often conflict +with other LaTeX packages which are unaware of pLaTeX/upLaTeX. +In the worst case, such packages throw a fatal error or +end up with a wrong output. + +The goal of this package "plautopatch" is that +there should be no need to worry about such incompatibilities, +because specific patches are loaded automatically +whenever necessary. +This helps not only to simplify source files, but also +to make the appearance of working pLaTeX/upLaTeX sources +similar to those of ordinally LaTeX ones. + +The following patches are currently registered: + +- tracefnt (latex) -> ptrace/uptrace (platex/uplatex) +- fltrace (latex) -> pfltrace (platex) +- array (latex-tools) -> plarray (platex-tools) +- array (latex-tools) + plext (platex) -> plextarray (platex-tools) +- delarray (latex-tools) + plext (platex) -> plextdelarray (platex-tools) +- everysel (ms) -> pxeverysel (platex-tools) +- everyshi (ms) -> pxeveryshi (platex-tools) +- atbegshi (oberdiek) -> pxatbegshi (platex-tools) +- ftnright (latex-tools) -> pxftnright (platex-tools) +- pdfpages -> pxpdfpages (maintained here!) + +## Requirements + +This package depends on "filehook" package, +written by Martin Scharrer. + +## Miscellaneous + +This bundle may distribute some tiny patches +together with the main package. Short information: + +- pxpdfpages.sty: + Patch for pdfpages.sty (by An­dreas Matthias) to support + Japanese-style crop marks (called 'tombow' in Japanese). + Can be used on pLaTeX/upLaTeX. + +## Installation + +- *.sty -> $TEXMF/tex/platex/plautopatch +- *.tex, *.pdf -> $TEXMF/doc/platex/plautopatch + +## Repository + +The bundle is maintained on GitHub: + https://github.com/aminophen/plautopatch + +## License + +The bundle may be distributed and/or modified under the terms of +the 3-clause BSD license (see [LICENSE](./LICENSE)). + +## Release Date + +2018-08-22 + +Hironobu Yamashita diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/luatex/luatexja/luatexja.dtx texlive-lang-2018.20180824/texmf-dist/doc/luatex/luatexja/luatexja.dtx --- texlive-lang-2018.20180725/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/luatex/luatexja/luatexja.dtx 2018-08-03 21:17:14.000000000 +0000 @@ -72,7 +72,12 @@ \usepackage{luatexja-adjust}%\ltjdisableadjust \advance\leftmargini-1\zw\advance\leftmarginii-1\zw % - +%\long\def\fakefn#1#2{\par\noindent{\footnotesize\hbox to1.8em{\hss#1}#2\par}} +%<*ja> +\long\def\fakefn#1#2{% + \par{\footnotesize\advance\leftskip 3\zw\parindent1\zw\noindent + \llap{#1\hskip.3\zw}#2\par}} +% %%%%%%%% listings %%%%%%%% IVS @@ -640,7 +645,7 @@ \item \Pkg{adobemapping} (Adobe cmap and pdfmapping files) \item \Pkg{etoolbox}, \Pkg{everysel} (if you want to use \LuaTeX-ja with \LaTeXe) \item \Pkg{ltxcmds}, \Pkg{pdftexcmds}, \Pkg{filehook}, \Pkg{atbegshi} -\item \Pkg{fontspec} v2.4 (or later) +\item \Pkg{fontspec} v2.5c (or later) %\item \emph{IPAex fonts} (\url{http://ipafont.ipa.go.jp/}) %\item \emph{IPAexフォント(\url{http://ipafont.ipa.go.jp/})} \end{itemize} @@ -1429,16 +1434,21 @@ % %<*en> -In the \Pkg{luatexja-fontspec} package, the following seven~commands are defined as -counterparts of original commands in the \Pkg{fontspec} package: +In the \Pkg{luatexja-fontspec} package, several commands are defined as +counterparts of original commands in the \Pkg{fontspec} package +(see \autoref{tab:ltj_fntspc}): % %<*ja> -\Pkg{luatexja-fontspec}パッケージでは，以下の7つのコマンドを\Pkg{fontspec} -パッケージの元のコマンドに対応するものとして定義している： +\Pkg{luatexja-fontspec}パッケージでは，\autoref{tab:ltj_fntspc}の +「和文」行に示した命令を\Pkg{fontspec}パッケージの元のコマンド（「欧文」行） +に対応するものとして定義している： % %<*en> -\begin{center}\small -\begin{tabular}{ccccc} +\begin{table} +\caption{Commands of \Pkg{luatexja-fontspec}}\label{tab:ltj_fntspc} +\medskip +{\centering\small +\begin{tabular}{cllll} \toprule Japanese fonts &\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\ @@ -1446,18 +1456,33 @@ &\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\ \midrule Japanese fonts -&\cs{newjfontfamily}&\cs{newjfontface} -&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\ +&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\ +alphabetic fonts +&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\ +\midrule +Japanese fonts +&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\ alphabetic fonts -&\cs{newfontfamily}&\cs{newfontface} -&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\ +&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\ \bottomrule -\end{tabular} -\end{center} +\end{tabular}\par} +\medskip +\fakefn{$^*$}{% + \cs{setmonojfont} is defined if and only if \texttt{match} option is specified.} +\fakefn{$^{**}$}{% + \cs{renewfontfamily}~and~\cs{setfontfamily} are new commands + in \Pkg{fontspec}~v2.6h (2018/7/30). + Hence, \Pkg{luatexja-fontspec} define \cs{renewjfontfamily}~and~\cs{setjfontfamily} + only when \Pkg{fontspec}~v2.6h (or later) is used. +} +\end{table} % %<*ja> -\begin{center}\small -\begin{tabular}{ccccc} +\begin{table} +\caption{\Pkg{luatexja-fontspec}で定義される命令}\label{tab:ltj_fntspc} +\medskip +{\centering\small +\begin{tabular}{cllll} \toprule 和文 &\cs{jfontspec}&\cs{setmainjfont}&\cs{setsansjfont}&\cs{setmonojfont}$^*$\\ @@ -1465,14 +1490,28 @@ &\cs{fontspec}&\cs{setmainfont}&\cs{setsansfont}&\cs{setmonofont}\\ \midrule 和文 -&\cs{newjfontfamily}&\cs{newjfontface} -&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\ +&\cs{newjfontfamily}&\cs{renewjfontfamily}$^{**}$&\cs{setjfontfamily}$^{**}$\\ 欧文 -&\cs{newfontfamily}&\cs{newfontface} -&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\ +&\cs{newfontfamily}&\cs{renewfontfamily}$^{**}$&\cs{setfontfamily}$^{**}$\\ +\midrule +和文 +&\cs{newjfontface}&\cs{defaultjfontfeatures}&\cs{addjfontfeatures}\\ +欧文 +&\cs{newfontface}&\cs{defaultfontfeatures}&\cs{addfontfeatures}\\ \bottomrule -\end{tabular} -\end{center} +\end{tabular}\par} + +\medskip +\fakefn{$^*$}{\cs{setmonojfont} は \texttt{match} オプションが +指定された時のみ定義される．} +\fakefn{$^{**}$}{% + \cs{renewfontfamily} と \cs{setfontfamily} は + \Pkg{fontspec}~v2.6h (2018/7/30)で新たに追加された命令である． + そのため，\Pkg{luatexja-fontspec}が \cs{renewjfontfamily} と \cs{setjfontfamily} を + 定義するのはv2.6h以降の\Pkg{fontspec}を使用した時のみになっている． +} + +\end{table} % % The package option of \Pkg{luatexja-fontspec} are the followings: @@ -6378,7 +6417,7 @@ \begin{table}[t] \centering\small - \caption{strut}\label{tab:strutbox} + \caption{strut}\label{tab:strutbox}\medskip \begin{tabular}{llcccl} \toprule \textbf{box}&\textbf{direction}&\textbf{width}&\textbf{height}&\textbf{depth} @@ -6795,11 +6834,11 @@ \\ \bottomrule \end{tabular}\par} -\smallskip +\medskip -Note: the value of +\fakefn{}{The value of \Param{kanjiskip} is 0\,pt${}^{+1/5\,\mathrm{em}}_{-1/5\,\mathrm{em}}$ in this figure, -for making the difference obvious. +for making the difference obvious.} %\caption{行長調整}\label{fig:adj} %\caption{Line adjustment}\label{fig:adj} \end{figure} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/luatex/luatexja/README texlive-lang-2018.20180824/texmf-dist/doc/luatex/luatexja/README --- texlive-lang-2018.20180725/texmf-dist/doc/luatex/luatexja/README 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/luatex/luatexja/README 2018-08-03 21:17:14.000000000 +0000 @@ -1,4 +1,4 @@ -The LuaTeX-ja Package 20180616.0 +The LuaTeX-ja Package 20180803.0 -------------------------------- Copyright (c) 2011--2018 The LuaTeX-ja project License: modified BSD (see COPYING) @@ -40,9 +40,9 @@ 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20180616.0 in the Git repository by + or tagged as 20180803.0 in the Git repository by + ;a=snapshot;h=refs/tags/20180803.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -87,4 +87,4 @@ * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Sat Jun 16 16:26:54 2018 +0900 +Last commit date: Fri Aug 3 13:24:03 2018 +0900 diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/man/man1/tlmgr.1 texlive-lang-2018.20180824/texmf-dist/doc/man/man1/tlmgr.1 --- texlive-lang-2018.20180725/texmf-dist/doc/man/man1/tlmgr.1 2018-06-04 00:24:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/man/man1/tlmgr.1 2018-07-26 00:23:33.000000000 +0000 @@ -129,7 +129,7 @@ .\" ======================================================================== .\" .IX Title "TLMGR 1" -.TH TLMGR 1 "2018-06-03" "perl v5.26.2" "User Contributed Perl Documentation" +.TH TLMGR 1 "2018-07-25" "perl v5.26.2" "User Contributed Perl Documentation" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -741,6 +741,12 @@ .IX Item "--only-installed" If this option is given, the installation source will not be used; only locally installed packages, collections, or schemes are listed. +.IP "\fB\-\-only\-remote\fR" 4 +.IX Item "--only-remote" +Only list packages from the remote repository. Useful when checking what +is available in a remote repository using +\&\f(CW\*(C`tlmgr \-\-repo ... \-\-only\-remote info\*(C'\fR. Note that +\&\f(CW\*(C`\-\-only\-installed\*(C'\fR and \f(CW\*(C`\-\-only\-remote\*(C'\fR cannot both be specified. .ie n .IP "\fB\-\-data \f(CB""item1,item2,...""\fB\fR" 4 .el .IP "\fB\-\-data \f(CBitem1,item2,...\fB\fR" 4 .IX Item "--data item1,item2,..." @@ -842,7 +848,7 @@ .Sp The \f(CW\*(C`add\*(C'\fR argument requires another argument, either a filename or \&\f(CW\*(C`\-\*(C'\fR for stdin, from which the key is added. The key is added to the -local keyring \f(CW\*(C`GNUPGHOME/repository\-keys.gpg\*(C'\fR, which is normally) +local keyring \f(CW\*(C`GNUPGHOME/repository\-keys.gpg\*(C'\fR, which is normally \&\f(CW\*(C`tlpkg/gpg/repository\-keys.gpg\*(C'\fR. .Sp The \f(CW\*(C`remove\*(C'\fR argument requires a key id and removes the requested id @@ -2243,4 +2249,4 @@ distribution () and both are licensed under the \&\s-1GNU\s0 General Public License Version 2 or later. .PP -\&\f(CW$Id:\fR tlmgr.pl 47907 2018\-06\-03 18:09:29Z karl $ +\&\f(CW$Id:\fR tlmgr.pl 48271 2018\-07\-25 01:51:31Z preining $ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/man/man1/tlmgr.man1.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/man/man1/tlmgr.man1.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/base/exppl2e.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/base/exppl2e.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/base/platex-en.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/base/platex-en.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/base/platex.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/base/platex.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/base/platexrelease.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/base/platexrelease.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/base/pldoc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/base/pldoc.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/platex/base/README.md texlive-lang-2018.20180824/texmf-dist/doc/platex/base/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/platex/base/README.md 2018-05-20 21:31:08.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/platex/base/README.md 2018-07-28 22:03:37.000000000 +0000 @@ -61,6 +61,6 @@ ## Release Date -2018-05-20 +2018-07-28 Japanese TeX Development Community diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/LICENSE texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/LICENSE --- texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/LICENSE 2017-04-10 21:39:50.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/LICENSE 2018-08-17 22:07:02.000000000 +0000 @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Takayuki YATO (aka. "ZR") +Copyright (c) 2018 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.tex texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.tex --- texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.tex 2017-11-19 22:17:51.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/pxrubrica-en.tex 2018-08-17 22:07:02.000000000 +0000 @@ -8,8 +8,8 @@ \newcommand*{\Eg}{E.\,g.\mbox{}} \newcommand*{\eg}{e.\,g.\mbox{}} \newcommand*{\ie}{i.\,e.\mbox{}} -\newcommand*{\myfileversion}{1.3b} -\newcommand*{\myfiledate}{2017/11/19} +\newcommand*{\myfileversion}{1.3c} +\newcommand*{\myfiledate}{2018/08/16} \newsavebox{\myexample} \begin{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/platex/pxrubrica/pxrubrica.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/platex/pxrubrica/pxrubrica.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/eptexdoc.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex 2017-04-17 22:25:33.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/eptexdoc.tex 2018-08-18 21:18:32.000000000 +0000 @@ -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 @@ \item \TeX~Live~2011$B$Ke$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$&/$J$/$H$b(B\eTeX $B3HD%<+BN$O$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 @@ \paragraph{$B%l%8%9%?$NA}2C(B} $B:G=i$K=R$Y$?$h$&$K!$(B\TeX $B$G$O(B6$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/$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$Fe$N(Bpdf$B$K$h$k$H:G=i$N(B0--255$B$H0c$C$FJ}$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$Ge!$$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>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 @@ \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$&$Ae0L(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$re;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 @@ % \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$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$,/!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$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$B$H$*$/$H$-!$(B \[ - \hbox{\.{gluestretchorder}\.{someglue}}= + \hbox{|\gluestretchorder\someglue|}= \begin{cases} 0&\text{$B$,9b!9(B\texttt{fi}$B%l%Y%k$NNL(B}\\ 1&\text{$B$,$A$g$&$I(B\texttt{fil}$B%l%Y%k$NL58BNL(B}\\ @@ -504,7 +556,14 @@ \begin{verbatim} \pdfstrcmp{$B$"(B}{^^e3^^81^^83} % $B!V$"!W$O(BUTF-8$B$G(BE38182 \end{verbatim} - $B$Ne!$K\J8$K=R$Y$?F~NONc$re5-$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 @@ \.{pdfsetrandomseed} \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$+$ie$NMp?t@8@.%W%j%_%F%#%V$HF1;~$K\:Y$JGX7J@bL@!&;EMM$O(B\cite{lnc}$B$K>y$k!%(B \pTeX $B$G$O(B @@ -622,7 +699,7 @@ 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 @@ $B$H$J$j!$8+$?L\$G$OF1$8!V(Bfi$B!W$,(B\.{lastnodechar}$Bl9g!J:8B&!K$G$O(B\.{lastnodechar}$B$NuBV$r(B\.{showlists}$B$GD4$Y$F$_$k$Ho$NOBJ8J8;z$N4V$KF~$k$O$:$N$b$N!K$G$"$k$3$H$,$o$+$k!%(B @@ -701,7 +777,95 @@ \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$Nl9g$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$^$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 @@ (\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$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%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 +$Br7o$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!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!"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$,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 @@ $B3F%F!<%V%k$X$N%$%s%G%C%/%9Ey$N>pJs$re$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!"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.$5$$$H$-(B\\ + $B$3$N%o!<%I$rl9g!"(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}$rl9g(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 @@ \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. \\ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex_asciimw.tex 2018-08-18 21:18:32.000000000 +0000 @@ -0,0 +1,653 @@ +\newcommand{\cs}[1]{{$\backslash$#1}} +\documentstyle[twoside]{jarticle} +\addtolength{\textheight}{.5in} +\addtolength{\textwidth}{.7in} +\setlength{\oddsidemargin}{.4in} +\setlength{\evensidemargin}{.4in} +\title{\TeX $B%7%9%F%`$NF|K\8l2=(B} +\author{$BARBt(B $BNI0l(B\\ASCII Corporation} +\date{$B>5CN$7$F$b$i$$$?$$!#(B +$B>0!"K\9F$O$3$NF|K\8l2=$5$l$?(B\TeX $B%7%9%F%`$G(B\LaTeX $B$rMQ$$$F:n@.$7$?!#(B +\end{abstract} +% +\newpage +\tableofcontents +\newpage +%\listoftables +%\newpage +% +\section{\TeX $B%7%9%F%`F|K\8l2=$NJ}?K(B} +\TeX $B%7%9%F%`$rF|K\8l2=$9$k$K$"$?$j!"e$,$j$,H~$7$$$3$H!#(B\\ + \TeX $BK\Mh$NL\E*$G$"$k(B``\.$BH~(B\.$B$7(B\.$B$$(B\.$B=P(B\.$BNO(B''$B$,F@$i$l$J$1$l$P!"(B + $BF|K\8l2=$r9T$&0UL#$OA4$/L5$/$J$C$F$7$^$&!#(B + $B9b@-G=$N=PNO%G%P%$%9$H9bIJ0L$N%U%)%s%H$rMQ$$$k$3$H$K$h$j!"(B + $B$G$"$k!#(B +$BOBJ8$KBP$7$F$b!"2$J8$N$h$&$K<+M3$K%U%)%s%H$r@Z$j49$($?$j!"(B +$B%^%/%mDj5A$,9T$$$?$$$H$$$&$N$OEvA3$G$"$j!"(B +$B$=$l$,(B\TeX $B$N$h$&$JJ8=q=hM}%7%9%F%`$NL%NO$N(B1$B$D$G$"$k$+$i$G$"$k!#(B\\ +2.$B$KIU$$$F$O!"OBJ8$r07$&>l9g$K$OI,A3E*$KIU$$$F$^$o$kLdBj$G!"(B +$B$3$l$i$N=hM}$,3N8:$7$F$7$^$&$H9M$($i$l$k!#(B\\ +3.$B$NFbMF$O>/$7Bg$2$5$J$h$&$K$b;W$($k$,!"(B +Don\nolinebreak\ Knuth$B$N(B\TeX $B3+H/$NL\E*$+$i$9$l$P!";j6KEvA3$N$3$H$G$b$"$k!#(B +$BKt!"$3$l$O(B 1.$B$d(B2.$B$NFbMF$,Bg$-$/4X$o$C$F$$$k$N$O8@$&$^$G$b$J$$$3$H$G$"$k!#(B + +$B$3$N$h$&$JMW5a$r!"=PMh$k8B$jK~B-$9$k$?$a$K(B +$Be5-$NJ}?K$K4p$E$-F|K\8l2=$r9T$C$?7k2L!"8=;~E@$G0J2<$N$h$&$K-Mh$N%Q!<%=%J%k%3%s%T%e!<%?$X$N0\?"Ey$r9M$(9g$o$;$?7k2L!"(B +$BFbIt%3!<%I!"30It%3!<%I6&$K(BASCII$B!"%7%U%H(BJIS$B$NAH$_9g$;$rMQ$$$?!#(B +$B$?$@$7!"(BDVI$B%U%!%$%kFb$N4A;z%3!<%I$@$1$O!"(BJIS$B%3!<%I$r=PNO$9$k$h$&$K$J$C$F$$$k!#(B +$B$^$?H>3Q%+%J$N%5%]!<%H$O9T$C$F$$$J$$!#(B +% +\subsection{$B%W%j%_%F%#%V(B} +$BF|K\8l2=$KH<$$!"4v$D$+$N%W%j%_%F%#%V$NDI2C$*$h$S3HD%$r9T$C$?!#(B +$B$3$l$i$O!"6XB'=hM}!"%*!<%H%9%Z!<%7%s%0$*$h$S4A;z%3!<%I$N$?$a$N$b$N$G$"$k!#(B +$B$3$N;~!"?7$7$/DI2C$9$k%W%j%_%F%#%V$K$D$$$F$O!"F|K\8lFHFC$N?7$7$$=hM}$K(B +$BBP$9$k$b$N$@$1$K;_$a!"=PMh$k$@$14{B8$N%W%j%_%F%#%V$r3HD%$9$k$h$&$KEX$a$?!#(B +% +\subsubsection{$B%W%j%_%F%#%V$NDI2C(B} +\label{tbpri} +Table~\ref{tb:prim}$B$K<($9%W%j%_%F%#%V$,DI2C$5$l$F$$$k!#(B +$B!J>\$7$/$O!"0J9_$N%;%/%7%g%s$G2r@b$9$k!#!K(B +% +\subsubsection{$B%W%j%_%F%#%V$N3HD%(B} +$B4{B8$N%W%j%_%F%#%V$K4X$7$F$O!"=PMhF@$k8B$j2$J8!"OBJ8$N6hJL$r$;$:$K(B +$B07$($k$h$&3HD%$r9T$C$?!#(B +$B$^$?FbIt$G07$&%H!<%/%s$KBP$9$kF|K\8l2=$r9T$&$3$H$K$h$C$F!"(B +$B%W%j%s%F%#%s%0%-%c%i%/%?$N$_$G$J$/!"%^%/%mL>$d%H!<%/%s%j%9%H(B +$B$K$bA43QJ8;z$rH>3QJ8;z$H:.:_$7$F07$($k$h$&$K$J$C$F$$$k!#(B + +\noindent $BNc(B. +\begin{quote} +\cs{char}''82A0\\ +\cs{accent}''5F`$B$"(B\\ +\cs{def}\cs{$B2~%Z!<%8(B}\{\cs{eject}\} +\end{quote} +% +\begin{table}[htb] +\begin{tabular}{|l|p{4in}|} \hline +\cs{\it prebreakpenalty} & + $B;XDj$9$k%-%c%i%/%?%3!<%I$NA0J}$KA^F~$9$k%Z%J%k%F%#$NCM$r@_Dj$9$k!#(B + $B9TF,6XB'$N;XDj$H$7$FMQ$$$k!#(B \\ +& $BNc(B. {\tt\cs{prebreakpenalty}`$B!"(B$=$1000} \\ \hline +\cs{\it postbreakpenalty} & + $B;XDj$9$k%-%c%i%/%?%3!<%I$N8eJ}$KA^F~$9$k%Z%J%k%F%#$NCM$r@_Dj$9$k!#(B + $B9TKv6XB'$N;XDj$H$7$FMQ$$$k!#(B\\ +& $BNc(B. {\tt\cs{postbreakpenalty}`$B!N(B$=$1000} \\ \hline +\cs{\it jis} & + $B4A;z%3!<%I$NJQ49$r9T$&$?$a$N%W%j%_%F%#%V$G!"(B + JIS$B%3!<%I$+$iFbIt%3!<%I$G$"$k%7%U%H(BJIS$B$KJQ49$9$k!#(B\\ +& $BNc(B. {\tt\cs{prebreakpenalty}\cs{jis}"2122$=$1000} \\ \hline +\cs{\it kuten} & + \cs{jis}$B$HF1MM$K6hE@%3!<%I$+$i%7%U%H(BJIS$B$XJQ49$9$k!#(B\\ +& $BNc(B. {\tt\cs{postbreakpenalty}\cs{kuten}"0146$=$1000} \\ \hline +\cs{\it sjis} & + $B>e5-$N#2$D$HF1MM$G$"$k$,!"FbIt%3!<%I$,%7%U%H(BJIS$B$G$"$k$N$G!"(B + $B$=$N$^$^$NCM$r$+$($9!#(B\\ \hline +\cs{\it kanjiskip} & + $BA43Q%3!<%I4V$K<+F0E*$KA^F~$5$l$k%0%k!<$r;}$D%l%8%9%?!#(B\\ +& $BNc(B. {\tt\cs{kanjiskip}$=$0pt puls .3pt minus .3pt} \\ \hline +\cs{\it xkanjiskip} & + $BA43Q(B--$BH>3Q%3!<%I4V$K<+F0E*$KA^F~$5$l$k%0%k!<$r;}$D%l%8%9%?!#(B\\ +& $BNc(B. {\tt\cs{xkanjiskip}$=$2.5pt puls 1pt minus 1pt} \\ \hline +\cs{\it autospacing} & + $BA43Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$&$?$a$N;XDj!#(B \\ \hline +\cs{\it noautospacing} & + $BA43Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$o$J$$$?$a$N;XDj!#(B \\ \hline +\cs{\it autoxspacing} & + $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$&$?$a$N;XDj!#(B\\ \hline +\cs{\it noautoxspacing} & + $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$o$J$$$?$a$N;XDj!#(B\\ \hline +\cs{\it xspcode} & + $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$NBP>]$H$J$k(B + $BH>3Q%3!<%I$r;XDj$9$k!#(B + $B8=:_%G%U%)%k%H$NCM$H$7$F%"%k%U%!%Y%C%H$*$h$S?t;z$KBP$7$F(B + $B%9%Z!<%9$,A^F~$5$l$k$h$&$K@_Dj$5$l$F$$$k!#(B \\ +& $BNc(B. {\tt\cs{xspcode}`A$=$0} \\ \hline +\end{tabular} +\caption{$BF|K\8l2=$KH<$$DI2C$5$l$?%W%j%_%F%#%V!#(B} +\label{tb:prim} +\end{table} +% +\subsection{$B%i%$%s%V%l!<%/(B} +$B2$J8$HOBJ8$N=hM}$G8+$+$1>e:G$bBg$-$J0c$$$O!"%i%$%s%V%l!<%/=hM}$G$"$k$H;W$o$l$k!#(B +``$B8+$+$1>e(B''$B$H8@$&$N$O!"(B\TeX $BFbIt$N=hM}$K$O(B +$B$5$[$IBg$-$JJQ99$O$$$i$J$$$+$i$G$"$k!#(B +$B6qBNE*$K$O!"]$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$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} +$B\$7$/$O!"(B\TeX: The Program PART38$B!"(B39 Breaking paragraphs into lines. +$B$r@'HsFI$s$G$_$k$3$H$r$*4+$a$9$k!#!K(B +$B$=$3$G!"OBJ8Cf$NJ8;z4V$b%V%l!<%/%]%$%s%H$N8uJd$H$7$F!"(B +{\it try\_break}$B$KEO$9$h$&JQ99$7$?!#(B + +$BKt!"K\Mh$J$i$P%i%$%s%V%l!<%/$N=hM}$O!"e40A4$KJ,$1$F9M$($F$b:9$7;Y$($,$J$$$h$&$J(B +$B9=B$$K$J$C$F$$$k!#(B +$B$=$l$O!"%Z%J%k%F%#$H8F$P$l$k%V%l!<%-%s%0$N$?$a$N(B +$B0lHLE*$JI>2ACM$,F3F~$5$l$F$$$k$?$a$G$"$j!"(B +$B%V%l!<%-%s%0%k!<%A%s$G$O$3$NCM$rG!2?$KI>2A$9$k$+(B +$B$@$1$r9M$($l$PNI$/!"(B +$B6XB'=hM}%k!<%A%s$G$O!"$3$NCM$rG!2?$K@_Dj$9$k$+$@$1$r9M$($l$PNI$$!#(B +% +\subsection{$B6XB'=hM}(B} +% +\subsubsection{$B6XB'=hM}$G$N%Z%J%k%F%#$N1~MQ(B} +$BA0$N%;%/%7%g%s$G$b4JC1$K?($l$?$h$&$K!"(B +$B6XB'=hM}$b(B\TeX $B$K$H$C$FA4$/?7$7$$35G0$G$O$J$/!"(B +$B%Z%J%k%F%#$H8@$&7A$GF3F~$5$l$F$$$k!#(B +$B$3$l$O!">e5-$N%i%$%s%V%l!<%/$d%Z!<%8%V%l!<%/=hM};~$K!"(B +$B$=$N2U=j$,%V%l!<%/%]%$%s%H$H$7$F!"(B +$B$I$NDxEYE,@Z!JIiCM$N%Z%J%k%F%#!K$G$"$k$+$"$k$$$O(B +$BITE,@Z!J@5CM$N%Z%J%k%F%#!K$G$"$k$+$r<($9$?$a$NI>2ACM$G$"$k!#(B +$B$7$?$,$C$F!"$?$@C1$K$=$N2U=j$G$N%V%l!<%-%s%0$r6X;_$9$k$@$1$G$OL5$/!"(B +$B6/@)E*$J%V%l!<%-%s%0$d!"6XB'J8;z$,O"B3$9$k$h$&$J>l9g$N(B +$BM%@h=g0LIU$1$K$bMxMQ$G$-$k!#(B + +$BF|K\8l$N6XB'=hM}$K$3$N%Z%J%k%F%#$r1~MQ$9$k$?$a$K$OpJs$rEPO?$9$kA0$K%Z%J%k%F%#$rA^F~$9$k$3$H$r!"(B +{\bf\cs{post\-break\-penalty}}$B$O(B +$B;XDj$7$?J8;z$ND>8e$K%Z%J%k%F%#$rA^F~$9$k$3$H$r;XDj$9$k$b$N$G!"(B +$BA43QJ8;z!"H>3QJ8;z$N6hJLL5$7$K;XDj$G$-$k!#(B +$B$3$l$i$O!"F10l$NJ8;z$KBP$7$FF1;~$KN>J}$N%Z%J%k%F%#$rA^F~$9$k$h$&$K$O(B +$B;XDj$G$-$J$$!#(B $B$b$7F10l$NJ8;z$KBP$7$FAPJ}$N;XDj$,$5$l$?>l9g!"(B +$B8e$+$i$N$b$N$KCV$-49$($i$l$k!#(B +$BL^O@$3$l$i$O(B``\{\}''$B$K$h$k!"%0%k!<%T%s%05,B'$,E,MQ$5$l$k!#(B +$BKt!"APJ}$G;XDj$G$-$kJ8;z?t$O:GBg$G(B256$BJ8;z$^$G$G$"$k!#(B +$B$3$NCM$O!"A43QJ8;z!"H>3QJ8;z$r9g$o$;$F6XB'BP>]$H$J$k$H9M$($i$l$k(B +$BJ8;z?t$r!"==J,$K%+%P!<$7$F$$$k$H;W$o$l$k!#(B + +$B$3$N6XB'%F!<%V%k$+$i$NEPO?$N:o=|$O!"(B +$B%Z%J%k%F%#CM(B`0'$B$r@_Dj$9$k$3$H$K$h$C$F9T$o$l$k$,!"(B +$B%0%m!<%P%k%l%Y%k$G$N@_Dj$G$J$1$l$P!"(B +$B$3$N%F!<%V%k$NNN0h$O2rJ|$5$l$J$$$3$H$KCm0U$7$FM_$7$$!#(B +$B$J$<$J$i!"%m!<%+%k%l%Y%k$GNN0h$r2rJ|$7$F$7$^$($P!"(B +$B$=$N30B&$N%l%Y%k$KLa$C$?$H$-$K!"$=$N%l%Y%k$G$NCM$r(B +$B:G@_Dj$9$k$?$a$NNN0h$,3NJ]$5$l$F$$$kJ]>Z$,$J$$$+$i$G$"$k!#(B + +$B$3$N%F!<%V%k$,$G$-$l$P!"3FJ8;z$rFI$_9~$`EY$K!"(B +$B$=$NJ8;z$,$3$N%F!<%V%k$KEPO?$5$l$F$$$k$+$I$&$+$rD4$Y!"(B +$BEPO?$5$l$F$$$l$P$=$N%Z%J%k%F%#$rJ8;z$NA08eE,@Z$J0LCV$KA^F~$7$F9T$1$PNI$$!#(B +$B$3$N6XB'%F!<%V%k$N8!:w$K$O%O%C%7%eK!$rMQ$$$F$*$j!"(B +$B%O%C%7%e4X?t$H$7$F(B +\label{`$B%O%C%7%e4X?t(B'} +\[\left\{ \begin{array}{cl} + (C2+(C2<<(C1-0x81)))\,mod 256 & $B4A;z%3!<%I(B\\ + & C1=$B>e0L%P%$%H!"(BC2=$B2<0L%P%$%H(B\\ + \\ + C*2+1 & ASCII$B%3!<%I(B + \end{array} +\right. \] +$B$rMQ$$$F$$$k!#(B +$B$3$l$O!"$*$=$i$/6XB'$NBP>]$H$J$k$G$"$m$&!"(B +$BA43Q$N5-9f!"$R$i$,$J%+%?%+%J$N>.J8;z!"(BASCII$B%3!<%I$N5-9fEy(B +$B$rE,Ev$K;6$i$P$i$;$k$h$&$K9M$($F$"$k!#(B +$BKt!"$3$N%F!<%V%k$K$O:GBg(B256$BJ8;z$^$GEPO?2DG=$G$"$k$,!"(B +$B$`$d$_$KB?$/$NJ8;z$rEPO?$7$F%F!<%V%k$rK~$?$9$3$H$O!"(B +$B6XB'J8;z8!:w$N%*!<%P!<%X%C%I$rBg$-$/$7!"(B +$B%Q%U%)!<%^%s%9$KBg$-$J1F6A$rM?$($k$N$GCm0U$9$kI,MW$,$"$k!#(B + +$B$3$&$7$F%Z%J%k%F%#$rE,@Z$KA^F~$5$($7$F$7$^$($P!"(B +$B8e$O(B\TeX $B$N%i%$%s%V%l!<%/%k!<%A%s$K(B\. $B$*(B\. $B$^(B\. $B$+(B\. $B$;$7$F$7$^$($k!#(B +$BL^O@!"$3$N%F!<%V%k$K$$$+$K%Z%J%k%F%#$rEPO?$9$k$+$O!"(B +$B%f!<%6!<$N@UG$$G$"$k$H6&$K!"%Z%J%k%F%#CM$NJQ99$K$h$j<+M3$K(B +$B6XB'=hM}$KJQ2=$r$D$1$k$3$H$,$G$-$k!#(B +% +\subsection{$B%9%Z!<%7%s%0(B} +{\noautospacing\noautoxspacing +$B$3$l$^$G$NJQ99$G0lDL$j$NOBJ8$r=PNO$9$k$3$H$O2DG=$G$"$k!#(B +$B$H$3$m$,$3$l$@$1$G$O$^$@IT==J,$G!"(B +$B$3$N$^$^$G$O7h$7$F(B\. $BH~(B\. $B$7(B\. $B$$=PNO$OF@$i$l$J$$!#(B +$B$J$<$J$i!"2$J8$G$OC18lKh$K%9%Z!<%9$,A^F~$5$l!"(B +$B$=$3$G$N%9%Z!<%7%s%0NL$rD4@0$9$k$3$H$K$h$j!"(B +$B%8%c%9%F%#%U%!%$%1!<%7%g%s$N=hM}$,9T$o$l$F$$$?!#(B +$B$H$3$m$,!"$3$l$^$G$NJQ99$@$1$G$O!"(B +$BOBJ8$KBP$7$F$=$N$h$&$JD4@0$r9T$&ItJ,$,$[$H$s$IL5$$$N$G$"$k!#(B +$B$3$N>uBV$,$$$C$?$$$I$N$h$&$J$b$N$G$"$k$+(B +$B;n$7$K!"$3$NCJMn$r>e5-$N(B{\it\cs{noautospacing\/}}$B$H(B +{\it\cs{noautoxspacing\/}}$B$K$h$C$F!"%9%Z!<%7%s%0$N<+F0A^F~$r(B +$B$7$J$$$GAH$s$G$_$?!#(B +$B$3$NA`:n$K$K$h$C$F!"$3$NCJMnCf$K$H$i$l$k%9%Z!<%9$O(B +$B%T%j%*%I!"%+%s%^$N8e$N%9%Z!<%9$N$_$G$"$k!#(B\par} + +%\autospacing\autoxspacing +$B0lL\$7$F2r$k$h$&$K!"9TKv$K(B1$BJ8;z0J>e$NITB7$$$,=PMh$F$7$C$^$F$$$k!#(B +$B$3$l$O!"%Q%i%0%i%UA4BN$r%@%$%J%_%C%/$K%V%l!<%-%s%0$9$k$H$$$C$?!"(B +\TeX $B$ND9=j$,0-$$J}$KF/$$$F$7$^$$!"(B +$B?t9T@h$N6XB'=hM}$N1F6A$,$=$N$^$^H?1G$5$l$F$$$k$N$G$"$k!#(B +$B6XB'%Z%J%k%F%#$N%Q%i%a!<%?$NCM$N0-$5$bl9g$G$b$3$N$h$&$J$3$H$O5/$3$i$J$$$h$&$G$"$k!#(B +$B$^$?AH$_I}$O!"A43Q$N@5?tG\$K$H$i$l$k$?$aF|K\8l$N$_$N(B +$B9T$G$OI,$:9TKv$,$-$l$$$KB7$&;E3]$K$J$C$F$$$k!#(B +$B$?$@$7!"6XB'$,@8$8$?$j!"ESCf$K2$J8$,A^F~$5$l$?$j$7$?>l9g$O!"(B +$B$d$O$j$I$3$+$GD4@0$,I,MW$K$J$C$F$/$k!#(B +$B$3$&$7$?D4@0$Ol9g!"DI9~$_$r9M$($k!#(B + $BDI9~$_$N$?$a$K!"%+%s%^!"%T%j%*%I!"3g8LEy$NJ8;z$r(B + $BH>3QI}$K$^$G=L$a$F$_$k!#(B +\item $B$=$l$G$bD4@0$7$-$l$:!"9TCf$K2$J8$,B8:_$9$k>l9g$O!"(B + $B2$J84V!"OBJ8(B--$B2$J84V$N%9%Z!<%9$rD4@0$9$k!#(B +\item $B$5$i$KD4@0$,I,MW$J>l9g$O!"$+$JJ8;z4V$N%9%Z!<%9$r(B + $BD4@0$9$k!#(B +\item $B$3$l$G$b$^$@BLL\$J>l9g!"DI$$=P$7$r;n$_$k!#(B +\end{itemize} +$B@bL@$,CY$l$F$7$^$C$?$,!"OBJ8(B--$B2$J84V$K$O8+1I$($rNI$/$9$k$?$a$K!"(B +4$BJ,3+$1$H8F$P$l$kA43QI}$N(B$1/4$$B$N%9%Z!<%9$,A^F~$5$l$k!#(B +$Be$N%+%s%^!"%T%j%*%I$NN`$NJ8;z$,B8:_$9$l$P!"(B +$B:G=i$NCJ3,$GD4@0$OIU$$$F$7$^$&!#(B + +\subsubsection{\TeX $B$G$N%9%Z!<%7%s%0(B} +$B$3$l$r(B\TeX $B$K1~MQ$9$k$3$H$r9M$($F$_$k!#(B + +$B$^$:AH$_I}$NLdBj$G$"$k$,!"(B\TeX $B$N>l9g!"2?J8;zI}$H$$$C$?(B +$B;XDj$b4JC1$Ko$KLLE]$G$"$k!#(B $B$3$&$7$?N`$N$b$N$O(B +$B@^3Q%3%s%T%e!<%?$r;HMQ$7$F$$$k$N$G$"$k$+$i!"(B +$B<+F0E*$K9T$C$F$[$7$$!#(B + +$B$3$N$h$&$JMW5a$rK~$?$9$?$a$K3QJ8;z4V!K(B + $B$KA^F~$7$FNI$$$o$1$G$O$J$$!#(B + $BNc$($P!"H>3Q$N%T%j%*%I!"%+%s%^!"3g8LN`5-9f$H(B + $BA43QJ8;z4V$K$OM>7W$J%9%Z!<%9$OF~$l$J$$J}$,$h$$!#(B +\item $B%*%j%8%J%k$N(B\TeX $B$G$O!"2~9T%-%c%i%/%?$rFI$_9~$`$3$H$K$h$j(B + $BC18l$N@Z$lL\$HH=CG$7!"%9%Z!<%9$,A^F~$5$l$k!#(B + $B$7$+$7!"OBJ8$G$O$3$&$7$?%9%Z!<%9$rA^F~$5$l$k$N$O(B + $BITET9g$G$"$k!#(B $B$=$3$GA43QJ8;z$N8e$N2~9T$O(B + $B$?$@C1$KFI$_Ht$P$9$@$1$N=hM}$KJQ99$9$kI,MW$,$"$k!#(B +\end{enumerate} + +1.$B$N$N%0%k!<$HF1$8$h$&$K=hM}$7$?$N$G$O!"(B +$BA43QJ8;z(B1$BJ8;z$KIU$-(B1$B%0%k!CHq$9$k$3$H$K$J$j!"(B +$BM>$j$K$b%a%b%j8zN($,0-$/$J$k!#(B $B$=$3$G$3$N%0%k!<$K4X$7$F$O!"(B +$B%i%$%s%V%l!<%/$d!"%\%C%/%9$X$NAH$_9~$_%k!<%A%s(B({\it hpack}) +$BFb$G$NAH$_I}$N7W;;$@$1$G=hM}$9$k$h$&$K$7$F$"$k!#(B + +2.$B$K4X$7$F$O!"(B\TeX $B$,?t<0Cf$G9T$C$F$$$k$h$&$K!"I,MW$J2U=j$K(B +$B3QJ8;z$NFb$N2?$l$KBP$7$F!"(B +$B%9%Z!<%9$rA^F~$9$Y$-$+$r;XDj$9$k$?$a$K!"(B +$BFbIt$K(B128$BJ8;zJ,$N%F!<%V%k$r@_$1!"$=$3$KEPO?$5$l$F$$$k(B +$BFbMF$K$h$C$F%9%Z!<%9A^F~$NM-L5$r7hDj$7$F$$$k!#(B +$B8=:_%G%U%)%k%H$G%"%k%U%!%Y%C%H$*$h$S?t;z$,%9%Z!<%9A^F~$N(B +$BBP>]$H$J$C$F$$$k!#(B $B$3$N%F!<%V%k$X$NEPO?$O!"(B{\bf\cs{xspcode}}$B$H$$$&(B +$B%W%j%_%F%#%V$K$h$C$F9T$&!#(B +$B3F(BASCII$B%-%c%i%/%?$KBP$7$F(B0$B$r@_Dj$9$k$3$H$K$h$j!"(B +$BA43Q$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$7!"$=$l0J30$NCM$G5v2D$9$k$h$&$K$J$C$F$$$k!#(B + +$B>0!"(B1.2.$B$K6&DL$9$k=hM}$H$7$F!"$3$l$i$N%l%8%9%?$NCM$O!"(B +$B$=$N%Q%i%0%i%U!"$"$k$$$O(B{\it hbox}$B$KF~$C$?;~E@$G$NCM$rJ];}$7$F(B +$B;HMQ$7!"$=$NCf$G$I$s$J$KJQ99$r2C$($F$b=hM}$K$O1F6A$,5Z$P$J$$(B +$B$h$&$K$J$C$F$$$k!#(B +$BKt!"$3$l$i$N=hM}$O!"(B{\bf\cs{auto\-spacing}}$B!"(B{\bf\cs{no\-auto\-spacing}}$B!"(B +{\bf\cs{auto\-xspacing}}$B!"(B{\bf\cs{no\-auto\-xspacing}}$B$K$h$C$F(B +ON$B!"(BOFF$B$G$-$k$h$&$K$J$C$F$$$k!#(B + +3.$B$O(B\TeX $B$N%9%-%c%s%K%s%0%k!<%A%s$rJQ99$9$k$3$H$G!"(B +$B%9%Z!<%7%s%0%-%c%i%/%?$H$7$F!"@h$N%k!<%A%s$KEO$C$F9T$+$J$$$h$&$K$7$?!#(B +% +\subsection{$B%U%)%s%H(B} +$B%U%)%s%H$K4X$7$F$b!"$G$-$k$@$12$J8$N$b$N$HF1$807$$$,=PMh$k$h$&$K(B +$BG[N8$7$?!#(B +\subsubsection{\TeX $B$G$NF|K\8l%U%)%s%H$N3QJ8;z$HA43QJ8;z$H$r;H$$J,$1$kEY$K(B +$B%U%)%s%H$N@Z$j49$($r9T$&$N$OHs>o$KHK;($J$N$G!"(B +$B%+%l%s%H%U%)%s%H$H$7$F$3$l$^$G$NH>3QJ8;zMQ$NB>$K(B +$BA43QJ8;zMQ$bFHN)$7$F;}$D$h$&$K$7$?$3$H$G$"$k!#(B +$B$3$l$K$h$C$FFC$K%U%)%s%H$NJQ99$r9T$&I,MW$,$J$1$l$P!"(B +$BA43Q!"H>3Q$N6hJL$r0U<1$9$k$3$H$J$7$K869F$rF~NO$9$k$3$H$,=PMh$k!#(B +$B6qBNE*$K$OeIU$-J8;z$d23Q!"A43Q$r0U<1$9$kI,MW$O$J$$!#(B +$B$?$@A43QMQ%+%l%s%H%U%!%_%j!<$,H>3QMQ$H0[$J$kE@$O!"(B +$BH>3QMQ$N%+%l%s%H%U%!%_%j!<$O!"%^%9%b!<%I$K(B +$B@Z$jBX$o$C$?;~E@$G(B-1$B$K%;%C%H$5$l$k$N$KBP$7!"(B +$BA43QMQ$N%+%l%s%H%U%!%_%j!<$O!"$=$N$^$^$NCM$rJ]$D$3$H$G$"$k!#(B +$B!J%^%9%b!<%ICf$G$N%U%)%s%H@Z$j49$($N%a%+%K%:%`$KIU$$$F$O!"(B +\TeX book p.154$BEy$r;2>H$N$3$H!#!K(B +$B$3$l$O!"?t<04X78$N%U%)%s%HDj5A$rF|K\8l%U%)%s%H$K$^$G(B +$B3HD%$7$F$$$J$$$?$a$NApJs$,CV$+$l$F$$$k!#(B + +\TeX $B$N%i%$%s%V%l!<%/Ey$N=hM}$O!"$3$N(Bchar$B%N!<%ICf$N%-%c%i%/%?%G!<%?$+$i(B +TFM$B%U%!%$%k$N;zI}>pJsEy$r8!:w$7$F=hM}$9$k;EAH$_$K$J$C$F$$$k!#(B +$B$7$?$,$C$F!"(B\TeX $B$rF|K\8l2=$9$k:]$K$O!"$3$l$i$r$I$N$h$&$K(B +$B3HD%$7!"$I$N$h$&$KBP1~IU$1$k$+$,%-!<%]%$%s%H$H$J$k!#(B +% +\subsubsection{TFM$B%U%!%$%k$N3HD%(B} +$B$^$:(BTFM$B%U%!%$%k$G$"$k$,!"$3$NCf$K$O(B{\it char\_info}$B$H8F$P$l$k(B +$B$=$N%U%)%s%HCf$KB8:_$9$k%-%c%i%/%?$N%3!<%I$H(B1$BBP(B1$B$KBP1~$9$k%F!<%V%k$,(B +$BCV$+$l$F$$$k!#(B +$B$3$N%F!<%V%kCf$K$O(B{\it width\/$B!"(Bheight\/$B!"(Bdepth}$BEy$NB>$N%F!<%V%k$X$N(B +$B%$%s%G%C%/%9$,@_Dj$5$l$F$*$j!"$3$N%$%s%G%C%/%9$rMQ$$$F(B +$B$=$l$>$l$N%Q%i%a!<%?$r;2>H$9$k;EAH$_$K$J$C$F$$$k!#(B + +$B$?$@$7!"$3$N%$%s%G%C%/%9$N%5%$%:$+$i!"(B +1$B%U%)%s%HFb$K4^$^$l$k%-%c%i%/%?$N%5%$%:$N$N%F!<%V%k$N;EAH$_$O!"(B +$B$=$N$^$^MxMQ$9$k$3$H$K$7!"(B{\it char\_info}$B%F!<%V%k$H4A;z$N(B2$B%P%$%H%3!<%I$r!"(B +$BBP1~IU$1$k$?$a$NJ}:v$r9M$($k$3$H$K$7$?!#(B + +$B$=$NMh$N(BTFM$B%U%!%$%k$H6hJL$9$k$?$a$K%5%U%#%C%/%9$r(B``{\bf JFM}'' +$B$HJQ99$7$?!#(B +% +\subsubsection{char$B%N!<%I$H(BJFM$B%U%!%$%k$NBP1~IU$1(B} +char$B%N!<%I$O!">e5-$7$?$H$*$j$=$3$K%U%)%s%H$H%-%c%i%/%?%3!<%I$r(B +$B;}$A!"$5$i$Kl9g$KI,MW$K$J$k$@$1$G!"(B +$B0lHL$NFbIt=hM}$G$OFI$_Ht$P$7$F$d$j$5$($9$l$PNI$$!#(B + +$B$"$k(Bchar$B%N!<%I$,F|K\8lMQ$N$b$N$G$"$k$+$I$&$+$O!"(B +char$B%N!<%IFb$N%U%)%s%H$rD4$Y!"$=$l$,4A;z%U%)%s%H$G$"$k$+$I$&$+$K$h$C$F(B +$BH=CG$9$k!#(B +$B$3$N=hM}$r4JC1$KG=N(NI$/9T$&$?$a$K!"(B +$B%U%)%s%H$,4A;z$+$I$&$+$N%F!<%V%k$r(B\TeX $BFbIt$K@_$1$F$"$k!#(B +% +\subsection{$B?t<0Cf$G$NF|K\8l$N;HMQ(B} +$B%U%)%s%H$N9`$G$b4JC1$K?($l$?$H$*$j!"(B +$B?t<0Cf$K$*$$$F$bF|K\8l$,07$($k$h$&$KJQ99$r9T$C$F$"$k!#(B +$B$3$l$O!"?t<0Cf$KD>@\F|K\8l$,4^$^$l$k$h$&$J(B +$B;H$$J}$O4u$G$"$k$,!"(B +\ref{`$B%O%C%7%e4X?t(B'}$BCf$N<0$N$h$&$K!"(B +$B4JC1$J@bL@Ey$rIU$12C$($?$$$3$H$ONI$/$"$k$+$i$G$"$k!#(B +% +\newpage +\section{$B:#8e$NM=Dj(B} +$B8=;~E@$^$G$N(B\TeX $B$NF|K\8l$N>uBV$r0lDL$jI=LLE*$JItJ,$N$_$G(B +$B$"$k$,2r@b$7$F$_$?!#(B +$BL^O@!"$^$@IT==J,$JE@$OB?!9$"$k$,!"(B +$B3Q4V$N%9%Z!<%9$O!"(B + {\bf\cs{kanji\-skip}}$B!"(B{\bf\cs{xkanji\-skip}}$B$NCM$,I,$:(B + $B;H$o$l$F$7$^$&$,!"$3$l$O(BJFM$B%U%!%$%kCf$K!"%G%U%)%k%HCM$r(B + $B@_Dj=PMh$k$h$&$K$7$F!"%U%)%s%H$NJQ99$H6&$K:GE,CM$r(B + $B;HMQ$G$-$k$h$&$K$7$?$$!#(B +\item $BA43Q$N5-9fEy$O!"A43QI}8GDj$G$O$J$/!"4pK\E*$K$O$=$NJ8;z$N;}$D(B + $Bl9g!"(B + $B9T$>$m$($,@53N$K9T$($:(B\. $BH~(B\. $B$7(B\. $B$/(B\. $B$J(B\. $B$$!#(B + $B$3$&$7$?5-9fN`$O4A;z%U%)%s%H$G$"$C$F$b!"(B + $BFH<+$N;zI}>pJs$r;}$D$h$&$K$7$?$$!#(B +\item $BA43QJ8;z$KBP$7$F$b!"J8;z$NAH$_9g$;$K$h$k%+!<%K%s%0$r(B + $B9T$&$Y$-$G$"$k!#(B $BFC$K$R$i$,$J%+%?%+%J$N8e$K!"%T%j%*%I!"(B + $B%+%s%^$NN`$NJ8;z$,B3$$$?>l9g$N!"(B + $B%9%Z!<%9$N6u$-J}$,IT<+A3$J$3$H$,>l9g$,$"$j!"(B + $BD4@0$G$-$k$h$&$K$9$kI,MW$,$"$k!#(B +\end{itemize} +% +%\appendix{TFM$B%U%!%$%k$N9=B$(B} +%\begin{tabular}{|cp{2in}|} \hline +%lf & lh \\ \hline +%bc & ec \\ \hline +%nw & nh \\ \hline +%nd & ni \\ \hline +%nl & nk \\ \hline +%ne & np \\ \hline +%\multicolumn{2}{|c|}{} \\ hline +\newpage +\appendix +\section{$B6XB'%Z%J%k%F%#$N@_DjNc(B} +$B6XB'%Z%J%k%F%#$N@_DjNc$H$7$F!"(B +$B$3$N%F%-%9%H@):n;~$K;HMQ$7$?@_Dj$r>e$2$F$*$/!#(B + +\vspace{15pt} +{\tt\noindent +\begin{tabular}{lll} +%$BH>3QJ8;z(B +\cs{prebreakpenalty}`.=1000 & +\cs{prebreakpenalty}`,=1000 & +\cs{prebreakpenalty}`\}=1000 \\ +\cs{postbreakpenalt}y`\{=1000 & +\cs{prebreakpenalty}`)=1000 & +\cs{postbreakpenalty}`(=1000 \\ +\cs{prebreakpenalty}`]=1000 & +\cs{postbreakpenalty}`[=1000 & +\cs{postbreakpenalty}`!=500 \\ +\cs{postbreakpenalty}`\#=500 & +\cs{postbreakpenalty}`\$=500 & +\cs{postbreakpenalty}`\%=500 \\ +\cs{postbreakpenalty}`\&=500 & +\cs{postbreakpenalty}`\`=500 & +\cs{prebreakpenalty}`|=500 \\ +\cs{prebreakpenalty}`;=500 & +\cs{prebreakpenalty}`?=500 & +\cs{prebreakpenalty}`:=500 \\ +%$BA43QJ8;z(B +\cs{prebreakpenalty}`$B!"(B=1000 & +\cs{prebreakpenalty}`$B!#(B=1000 & +\cs{prebreakpenalty}`$B!$(B=1000 \\ +\cs{prebreakpenalty}`$B!%(B=1000 & +\cs{prebreakpenalty}`$B!&(B=1000 & +\cs{prebreakpenalty}`$B!'(B=500 \\ +\cs{prebreakpenalty}`$B!((B=500 & +\cs{prebreakpenalty}`$B!)(B=500 & +\cs{prebreakpenalty}`$B!*(B=500 \\ +\cs{prebreakpenalty}`$B!K(B=800 & +\cs{postbreakpenalty}`$B!J(B=800 & +\cs{prebreakpenalty}`$B!Q(B=800 \\ +\cs{postbreakpenalty}`$B!P(B=800 & +\cs{prebreakpenalty}`$B!N(B=800 & +\cs{postbreakpenalty}`$B!O(B=800 \\ +\cs{postbreakpenalty}`$B!F(B=1000 & +\cs{prebreakpenalty}`$B!G(B=1000 & +\cs{prebreakpenalty}`$B!<(B=200 \\ +\cs{prebreakpenalty}`$B!\(B=200 & +\cs{prebreakpenalty}`$B!](B=200 & +\cs{prebreakpenalty}`$B!a(B=200 \\ +\cs{postbreakpenalty}`$B!t(B=200 & +\cs{postbreakpenalty}`$B!p(B=200 & +\cs{postbreakpenalty}`$B!s(B=200 \\ +\cs{postbreakpenalty}`$B!u(B=200 & +\cs{prebreakpenalty}`$B$!(B=150 & +\cs{prebreakpenalty}`$B$#(B=150 \\ +\cs{prebreakpenalty}`$B$%(B=150 & +\cs{prebreakpenalty}`$B$'(B=150 & +\cs{prebreakpenalty}`$B$)(B=150 \\ +\cs{prebreakpenalty}`$B$C(B=150 & +\cs{prebreakpenalty}`$B$c(B=150 & +\cs{prebreakpenalty}`$B$e(B=150 \\ +\cs{prebreakpenalty}`$B$g(B=150 & +\cs{prebreakpenalty}`$B%!(B=150 & +\cs{prebreakpenalty}`$B%#(B=150 \\ +\cs{prebreakpenalty}`$B%%(B=150 & +\cs{prebreakpenalty}`$B%'(B=150 & +\cs{prebreakpenalty}`$B%)(B=150 \\ +\cs{prebreakpenalty}`$B%C(B=150 & +\cs{prebreakpenalty}`$B%c(B=150 & +\cs{prebreakpenalty}`$B%e(B=150 \\ +\cs{prebreakpenalty}`$B%g(B=150 \\ +\end{tabular} +\begin{tabular}{ll} +\cs{prebreakpenalty}\cs{jis}"212B=1000 & +\cs{prebreakpenalty}\cs{jis}"212C=1000 \\ +\cs{prebreakpenalty}\cs{jis}"212D=1000 & +\cs{postbreakpenalty}\cs{jis}"212E=1000 \\ +\cs{prebreakpenalty}\cs{jis}"2139=250 & +\cs{prebreakpenalty}\cs{jis}"2144=250 \\ +\cs{prebreakpenalty}\cs{jis}"2145=250 & +\cs{postbreakpenalty}\cs{jis}"2146=1000 \\ +\cs{prebreakpenalty}\cs{jis}"2147=1000 & +\cs{postbreakpenalty}\cs{jis}"2148=1000 \\ +\cs{prebreakpenalty}\cs{jis}"2149=1000 & +\cs{postbreakpenalty}\cs{jis}"214C=800 \\ +\cs{prebreakpenalty}\cs{jis}"214D=800 & +\cs{postbreakpenalty}\cs{jis}"2152=800 \\ +\cs{prebreakpenalty}\cs{jis}"2153=800 & +\cs{postbreakpenalty}\cs{jis}"2154=800 \\ +\cs{prebreakpenalty}\cs{jis}"2155=800 & +\cs{postbreakpenalty}\cs{jis}"2156=800 \\ +\cs{prebreakpenalty}\cs{jis}"2157=800 & +\cs{postbreakpenalty}\cs{jis}"2158=800 \\ +\cs{prebreakpenalty}\cs{jis}"2159=800 & +\cs{postbreakpenalty}\cs{jis}"215A=800 \\ +\cs{prebreakpenalty}\cs{jis}"215B=800 & +\cs{prebreakpenalty}\cs{jis}"246E=150 \\ +\cs{prebreakpenalty}\cs{jis}"256E=150 & +\cs{prebreakpenalty}\cs{jis}"2575=150 \\ +\cs{prebreakpenalty}\cs{jis}"2576=150 \\ +\end{tabular}} + +\end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc_asciimw.tex 2018-08-18 21:18:32.000000000 +0000 @@ -0,0 +1,403 @@ +\def\cs#1{$\backslash$\kern0pt#1} +\def\angle#1{$\langle$\kern0pt#1\kern0pt$\rangle$} +\documentstyle{jarticle} +\begin{document} +\title{$BF|K\8l(B\TeX} +\author{$BARBt(B $BNI0l(B\\ASCII Corporation} +\date{$B>$5$J$1$l$P$J$j$^$;$s!#(B + +$BF|K\8l!J(B2$B%P%$%H%3!<%I%-%c%i%/%?!K$N%O%s%I%j%s%0$K4X$7$F$O!"(B +$B$G$-F@$k8B$j1Q;z!J(B1$B%P%$%H%3!<%I%-%c%i%/%?!K$HF1$8$h$&$Kl9g$N%9%Z!<%7%s%0(B +$B$N=hM}$J$I$,$"$j$^$9!#(B +$BF|K\8l(B\TeX $B$G$O!"$3$l$i$N=hM}$r<+F0E*$K9T$C$F$$$^$9$,!"(B +$B=@Fp@-$r9b$a$k$?$a$K!"$3$&$7$?=hM}$K4X78$9$k%Q%i%a!<%?$r<+M3$K:F@_Dj(B +$B$G$-$k$h$&$K$J$C$F$$$^$9!#(B + +$B%U%)%s%H$K4X$7$F$O!"(B1$B%U%)%s%H$G(BJIS$B%3!<%I$NBh(B1$B?e=`!"Bh(B2$B?e=`A4$F$r(B +$B07$($k$h$&$K3HD%$7$F$"$j$^$9$+$i!"1Q;z%U%)%s%H$HF1$8$h$&$K4A;z%U%)%s%H$r07$(!"(B +JFM(TFM)$B%U%!%$%k$r$D$/$k$3$H$K$h$j!"<+M3$K;HMQ2DG=$J%U%)%s%H$rA}$d$7$F(B +$B$$$/$3$H$,$G$-$^$9!#(B + +DVI$B%U%!%$%k$O!"(BSET2 $B$*$h$S(B PUT2 $B$r;H$C$F(B2$B%P%$%H%3!<%I$r=PNO$7$F$$$k$?$a!"(B +$B$3$l$^$G$N$b$N$H$N8_49@-$OJ]$?$l$F$$$^$9!#(B +$B$^$?(BDVI$B%U%!%$%k$K$O!"(BJIS$B%3!<%I$rMQ$$$F=PNO$7$F$$$^$9!#(B + +\section{$B869F$r=q$/>e$G$NCm0UE@(B} +$B4pK\E*$K$O!"2$J8$HOBJ8$OA4$/F1$8$h$&$K$7$F07$($^$9!#(B +$B$?$@$7!"F|K\8lFCM-$N=hM}5!G=$r;}$?$;$F$$$k$?$a!"(B +$B869F$r=q$/$&$($G$Ol9g$O!"I,$:H>3Q%9%Z!<%9$d%?%VEy$G4V$r6h@Z$C$F$/$@$5$$!#(B +\item $B2$J8$N>l9g!"2~9T$OC18l4V$N%9%Z!<%9$H$7$Fl9g!"869FFb$G$O<+M3$J2U=j$G2~9T$,9T$($?$[$&$,JXMx$G$9!#(B\\ + $B$=$3$GF|K\8l(B\TeX $B$G$O!"(B1$B9T$N=*$o$j$,(B1$B%P%$%H%3!<%I$N>l9g$O%9%Z!<%5!<(B + $B$NA^F~$r9T$$!"(B2$B%P%$%H%3!<%I$N>l9g$O2?$b9T$o$J$$$h$&$K$J$C$F$$$^$9!#(B +\item 2$B%P%$%H%3!<%I%-%c%i%/%?$H(B1$B%P%$%H%3!<%I%-%c%i%/%?$,(B + $BO"B3$9$k>l9g!"<+F0E*$K(B\cs{xkanjiskip}$B$K@_Dj$5$l$F$F$$$k%0%k!<$r(B + $BA^F~$7$^$9!#$?$@$7$3$N=hM}$O!"$I$N(B1$B%P%$%H%3!<%I%-%c%i%/%?$H$N(B + $B4V$G9T$&$+(B\cs{xspcode}$B$K$h$C$F;XDj$G$-!"%G%U%)%k%H$G$O(Ba--z, + A--Z, 0--9$B$H$N4V$G9T$o$l$k$h$&$K@_Dj$5$l$F$$$^$9!#(B + $B$3$N=hM}$rFCDj$N2U=j$G6X;_$7$?$$>l9g$O!"(B + $B$=$3$K(B\cs{kern0pt}$B!"(B\cs{hskip0pt}$B$J$I$rA^F~$7$F$/$@$5$$!#(B +\item $B6XB'=hM}$O!"6XB'$NBP>]$H$J$k%-%c%i%/%?$NA0J}$"$k$$$O(B + $B8eJ}$K%Z%J%k%F%#!<$r<+F0E*$KA^F~$9$k$3$H$G]$N%U%)%s%H$K$"$o$;$F(BJFM(TFM)$B$r:n$l$P;HMQ$G$-$^$9!#(B +\item $B%U%)%s%H$N@Z$j49$($O!"1Q;z$H4A;z$OFHN)$7$F9T$o$l$^$9!#(B + jlatex$B$G$O!"(B\cs{large},\cs{small}$B$J$I%5%$%:JQ99$N(B + $B%3%s%H%m!<%k%7!<%1%s%9$K$h$C$F!"(B + $BO"F0$7$F%U%)%s%H$r%A%'%s%8$9$k$h$&$K$7$F$$$^$9$,!"(B + jtex$B$G$O$=$N$h$&$JA`:n$O0l@Z9T$C$F$$$^$;$s$N$GCm0U$7$F$/$@$5$$!#(B + $B$?$@$7!";XDj$7$?%U%)%s%H$,0u;z$5$l$k$?$a$K$O!"$=$l$i$N;zBN!"%5%$%:$N(B + $B%U%)%s%H$,$=$m$C$F$$$J$1$l$P9T$($^$;$s!#(B + jlatex$B$G$O!"Dj$7$F$$$^$9!#(B + \begin{quote} + min5, min6, min7, min8, min9, min10, + min10 magstephalf, min10 magstep1, + min10 magstep2, min10 magstep3, + min10 magstep4, min10 magstep5, \\ + goth5, goth6, goth7, goth8, goth9, goth10, + goth10 magstephalf, goth10 magstep1, + goth10 magstep2, goth10 magstep3, + goth10 magstep4, goth10 magstep5 + \end{quote} + $B$3$l$i$,!"$-$A$s$H0u;z$5$l$k$+$I$&$+$O%W%j%s%?%I%i%$%P$N@UG$$G$9!#(B + $B$^$?!"$3$l$i$N%U%)%s%H$K$O%+!<%K%s%0!&%Q%i%a!<%?$,@_Dj$5$l$F$$$^$9!#(B + $B%+!<%K%s%0$r9T$$$?$/$J$$>l9g$O!">e5-$N%U%)%s%H$NBe$j$K0J2<$N$b$N$r(B + $B;HMQ$7$F$/$@$5$$!#$3$A$i$N%U%)%s%H$O!"%+!<%K%s%0$N%Q%i%a!<%?$,@_Dj(B + $B$5$l$F$$$J$$$3$H$r=|$$$F>e5-$N$b$N$HA4$/F1$8$b$N$G$9!#(B + \begin{quote} + nmin5, nmin6, nmin7, nmin8, nmin9, nmin10, + nmin10 magstephalf, nmin10 magstep1, + nmin10 magstep2, nmin10 magstep3, + nmin10 magstep4, nmin10 magstep5, \\ + ngoth5, ngoth6, ngoth7, ngoth8, ngoth9, ngoth10, + ngoth10 magstephalf, ngoth10 magstep1, + ngoth10 magstep2, ngoth10 magstep3, + ngoth10 magstep4, ngoth10 magstep5 + \end{quote} +\item $B8=:_$N%P!<%8%g%s$G$O!"A43Q%9%Z!<%9$O$[$+$N4A;z%-%c%i%/%?$HF1$8$h$&$K(B + $B07$o$l$^$9!#(B + $BH>3Q%9%Z!<%9$N$h$&$JFCJL$N=hM}$O9T$C$F$$$^$;$s$N$GCm0U$7$F$/$@$5$$!#(B +\item $B%3%s%H%m!<%k%7!<%1%s%9L>$K$bA43QJ8;z$r;HMQ$9$k$3$H$,$G$-$^$9$,(B + $B3QJ8;z$H:.:_$7$F;HMQ$9$k$3$H$,(B + $B$G$-$^$9!#(B + \end{enumerate} +\item $BH>3Q%+%J$O;H$($^$;$s!#869FFb$KH>3Q%+%J$N%3!<%I$,F~$i$J$$$h$&$K$7(B + $B$F$/$@$5$$!#(B +\end{itemize} + +\section{$BDI2C$5$l$?%W%j%_%F%#%V(B} + +$BF|K\8l(B\TeX $B$K$O$D$.$N%W%j%_%F%#%V$,DI2C$5$l$F$$$^$9!#(B +\begin{itemize} +\item \cs{{\bf kanjiskip}} + \begin{quote} + \cs{kanjiskip}$=$\angle{dimen} + \end{quote} + $BO"B3$9$k(B2$B%P%$%H%3!<%I4V$K<+F0E*$KA^F~$9$k%0%k!<$NCM$r(B + $B3JG<$9$k%l%8%9%?$G$9!#(B + $B$?$@$7!"$3$N=hM}$O(B\cs{autospacing}$B!"(B\cs{noautospacing}$B$K$h$C$F(B + $B9T$&$+9T$o$J$$$+$N;XDj$,$G$-$^$9!#(B\\ + $B$3$N%l%8%9%?$NCM$O!"%Q%i%0%i%U$N=*$o$j$^$?$O(B\cs{hbox}$B$N:G8e$N(B + $B;~E@$Ge(B2$B7e$,6h$r2<(B2$B7e$,E@$G$"$k$H2rA0$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$K$N$_(B + $B%9%Z!<%9$rA^F~$9$k$3$H$r5v2D$7$^$9!#(B + \item 2$B$r@_Dj$9$k$3$H$K$h$jD>8e$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$K$N$_(B + $B%9%Z!<%9$rA^F~$9$k$3$H$r5v2D$7$^$9!#(B + \item 3$B$r@_Dj$9$k$3$H$GA08e$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$G$N%9%Z!<%9$N(B + $BA^F~$r5v2D$7$^$9!#(B + \end{itemize} + + \noindent + $B;HMQNc(B\\ + {\tt\cs{xspcode}`1=0\\ + \cs{xspcode}`2=3\\ + \cs{xspcode}`;=2}\\ + $B$H$9$k$3$H$K$h$j!"(B`1' $B$KBP$9$k=hM}$r6X;_$7!"(B + `2' $B$KBP$7$FA08e$N=hM}$r5v2D$7$^$9!#(B + $B$^$?!"(B`;' $B$KBP$7$F$OD>8e$X$N%9%Z!<%9$NA^F~$r5v2D$7$^$9!#(B +\item \cs{{\bf inhibitxspcode}} + $B;XDj$7$?(B2$B%P%$%H%3!<%I$H$=$l$KA08e$9$k(B1$B%P%$%H%3!<%I$N4V$K(B + $B<+F0E*$KA^F~$5$l$k%9%Z!<%9$rM^@)$7$^$9!#(B + $B$3$N;XDj$O(B0--3$B$N$$$:$l$+$rA*Br$9$k$3$H$K$h$j(B + $BA0$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$K(B + $B%9%Z!<%9$rA^F~$9$k$3$H$r6X;_$7$^$9!#(B + \item 2$B$r@_Dj$9$k$3$H$K$h$jD>8e$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$K(B + $B%9%Z!<%9$rA^F~$9$k$3$H$r6X;_$7$^$9!#(B + \item 3$B$r@_Dj$9$k$3$H$GA08e$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$G$N%9%Z!<%9$N(B + $BA^F~$r5v2D$7$^$9!#(B + \end{itemize} + $B$3$N%W%j%_%F%#%V$O!"F|K\8l(B\TeX $B$N%P!<%8%g%s(B1.4$B$GDI2C$7$^$7$?!#(B + + \noindent + $B;HMQNc(B\\ + {\tt\cs{inhibitxspcode}`$B!)(B=0\\ + \cs{inhibitxspcode}`$B!J(B=2\\ + \cs{inhibitxspcode}`$B!K(B=1} +\item \cs{{\bf jcharwidowpenalty}} + \begin{quote} + \cs{jcharwidowpenalty}$=$\angle{number} + \end{quote} + $B%Q%i%0%i%U$N:G8e$NA43QJ8;z$,!"8IN)$7$F2~9T$5$l$k$N$rKI$0$?$a$N(B + $B%Z%J%k%F%#$G$9!#$^$?%Q%i%0%i%U$N:G8e$,(B1$BJ8;z0J>e$N(B1$B6h!"(B2$B6h!"(B7$B6h(B + $B$K4^$^$l$kJ8;z$N>l9g$O!"$=$ND>A0$K$"$kA43QJ8;z$KBP$7$F$3$N(B + $B%Z%J%k%F%#$,;H$o$l$^$9!#(B +\item \cs{{\bf autospacing}} + \begin{quote} + \cs{autospacing} + \end{quote} + $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r5v2D(B + $B$7$^$9!#(B +\item \cs{{\bf noautospacing}} + \begin{quote} + \cs{noautospacing} + \end{quote} + $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r6X;_(B + $B$7$^$9!#(B +\item \cs{{\bf autoxspacing}} + \begin{quote} + \cs{autoxspacing} + \end{quote} + $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I$H(B1$B%P%$%H%3!<%I4V$X$N%0%k!<$N(B + $B<+F0A^F~$r5v2D$7$^$9!#(B +\item \cs{{\bf noautoxspacing}} + \begin{quote} + \cs{noautoxspacing} + \end{quote} + $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I$H(B1$B%P%$%H%3!<%I4V$X$N%0%k!<$N(B + $B<+F0A^F~$r6X;_$7$^$9!#(B +\item \cs{{\bf prebreakpenalty}} + \begin{quote} + \cs{prebreakpenalty}\angle{16--bit number}$=$\angle{number} + \end{quote} + $B;XDj$9$kJ8;z$NA0J}$KA^F~$9$k%Z%J%k%F%#CM$r@_Dj$7$^$9!#(B + $B$3$N;XDj$O!"9TF,6XB'$N;XDj$K$"$?$j$^$9!#(B + + \noindent + $B;HMQNc(B\\ + {\tt\cs{prebreakpenalty}`$B$"(B$=$1000}\\ + $B$H$9$k$3$H$K$h$j!"(B`$B$"(B' $B$NA0J}$K(B1000$B$N%Z%J%k%F%#CM$,IU$1$i$l$^$9!#(B +\item \cs{{\bf postbreakpenalty}} + \begin{quote} + \cs{postbreakpenalty}\angle{16--bit number}$=$\angle{number} + \end{quote} + $B;XDj$9$kJ8;z$N8eJ}$KA^F~$9$k%Z%J%k%F%#CM$r@_Dj$7$^$9!#(B + $B$3$N;XDj$O!"9TKv6XB'$N;XDj$K$"$?$j$^$9!#(B\\ + $B$?$@$7!"(B\cs{prebreakpenalty}$B$H(B\cs{postbreakpenalty}$B$rF10l$N(B + $BJ8;z$KBP$7$FF1;~$K@_Dj$9$k$3$H$O$G$-$^$;$s!#(B + $BF10l$NJ8;z$KBP$7$FN>J}$N;XDj$r9T$C$?>l9g!"8e$+$i$N@_Dj$,M-8z$K$J$j$^$9!#(B +\item \cs{{\bf jfont}} \\ + $B4pK\E*$JF0:n$O!"(B``\cs{font}'' $B$HF1$8$G$9!#(B + $B$?$@$7!"(B`\cs{showthe}' $B$J$I$N%W%j%_%F%#%V$HAH$_9g$;$?>l9g$K(B + $B%+%l%s%H$N4A;z%U%)%s%H$rJV$7$^$9!#(B + $B%U%)%s%H$NDj5A$O!"(B\cs{font}, \cs{jfont}$B$N$I$A$i$r;H$C$F$b(B + $B1Q;z%U%)%s%H!"4A;z%U%)%s%H$NDj5A$,9T$($^$9!#(B +\item \cs{{\bf jfam}} \\ + `\cs{jfont}' $B$HF1MM$K(B ``\cs{fam}'' $B$H$[$H$s$IF1$8F0:n$r$7$^$9!#(B + `\cs{showthe}' $B$J$I$H$NAH$_9g$;$k$3$H$G!"%+%l%s%H$N4A;z%U%)%s%H(B + $B%U%!%_%j!<$rJV$7$^$9!#(B + $B$?$@$7$3$N%W%j%_%F%#%V$G$O!"1Q;z%U%)%s%H$N%U%!%_%j!<$r(B + $B4A;z%U%!%_%j!<$H$7$FDj5A$G$-$F$7$^$$$^$9$N$GCm0U$7$F$/$@$5$$!#(B +\item {{\bf zw, zh}} \\ + $B%W%j%_%F%#%V$H$O0[$J$j$^$9$,!"(B{\bf em, ex}$B$HF1$8$h$&$K(B + zw$B!"(Bzh$B$O!"$=$l$>$l%+%l%s%H$N(B2$B%P%$%H%3!<%I%U%)%s%H$NI}!JA43QI}!K(B + $B$*$h$S9b$5$NC10L5-9f$G$9!#(B + + \noindent + $B;HMQNc(B\\ + {\tt\cs{baselineskip}$=$1.5zh\\ + \cs{hsize}=20zw}\\ + $B$G%+%l%s%H%U%)%s%H$N9b$5$N(B1.5$BG\$NCM$,(B\cs{baselineskip}$B$KBeF~$5$l!"(B + \cs{hsize}$B$,A43Q(B20$BJ8;zJ,$K@_Dj$5$l$^$9!#(B +\end{itemize} + +\subsection{$B<+F0A^F~$5$l$k%9%Z!<%9$K$D$$$F(B} +\cs{kanjiskip}$B$d(B\cs{xkanjiskip}$B$N<+F0A^F~$O!"C1=c$KO"B3$9$kJ8;zNs$P$+$j$G$J$/(B +shift\_amount$B$,(B0$B$G$"$k(B\cs{hbox}$BFb$NJ8;z$H$NA08e4X78$K$*$$$F$b9T$o$l$^$9!#(B +$B$3$l$O!"(B\cs{hbox}$B$,F~;R>u$K$J$C$F$$$k>l9g$G$bF1$8$G$9!#(B +$B$D$^$j!"$=$N(B\cs{hbox}$BFb$K8=$l$k:G=i$NJ8;z$H:G8e$NJ8;z$H$,!"(B +box$B$NA08e$NJ8;z$KO"B3$9$kJ8;zNs$H$7$F2r]$H$O$J$j$^$;$s!#6qBNE*$K$O0J2<$NNc$r;29M$K$7$F$/$@$5$$!#(B + +\begin{tabular}{l@{ $\longrightarrow$ }c} +\verb|$B$"(B\hbox{A}$B$$(B| & $B$"(B\hbox{A}$B$$(B \\ +\verb|$B$"(B\hbox{\hbox{A}}$B$$(B| & $B$"(B\hbox{\hbox{A}}$B$$(B \\ +\verb|$B$"(B\hbox{\hbox{\hbox{A}}}$B$$(B| & $B$"(B\hbox{\hbox{\hbox{A}}}$B$$(B \\ +\verb|$B$"(B\hbox{\hbox{\hbox{\hbox{A}}}}$B$$(B| & $B$"(B\hbox{\hbox{\hbox{\hbox{A}}}}$B$$(B \\ +\verb|$B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}B}$B$$(B| & + $B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}B}$B$$(B \\ +\verb|$B$"(B\hbox{\hbox{\vbox{\hbox{A}}}B}$B$$(B| & + $B$"(B\hbox{\hbox{\vbox{\hbox{A}}}B}$B$$(B \\ +\verb|$B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}}$B$$(B| & + $B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}}$B$$(B \\ +\verb|$B$"(Bfi$B$$(B| & $B$"(Bfi$B$$(B \\ +\verb|$B$"(B\hbox{\hbox{\vbox{\hbox{A}}}}$B$$(B| & + $B$"(B\hbox{\hbox{\vbox{\hbox{A}}}}$B$$(B \\ +\verb|$B$"(B\hbox{\vbox{\hbox{\hbox{A}}}}$B$$(B| & + $B$"(B\hbox{\vbox{\hbox{\hbox{A}}}}$B$$(B \\ +\verb|$B$"(B\vbox{\hbox{\hbox{\hbox{A}}}}$B$$(B| & + $B$"(B\vbox{\hbox{\hbox{\hbox{A}}}}$B$$(B \\ +\verb|A\hbox{$B$"(B}A| & A\hbox{$B$"(B}A \\ +\verb|A\hbox{\hbox{$B$"(B}}A| & A\hbox{\hbox{$B$"(B}}A \\ +\verb|A\hbox{\hbox{\hbox{$B$"(B}}}A| & A\hbox{\hbox{\hbox{$B$"(B}}}A \\ +\verb|A\hbox{\hbox{\hbox{\hbox{$B$"(B}}}}A| & A\hbox{\hbox{\hbox{\hbox{$B$"(B}}}}A \\ +\verb|A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A| & + A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A \\ +\verb|A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A| & + A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A \\ +\verb|A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}}A| & + A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}}A \\ +\verb|A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}}A| & + A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}}A \\ +\verb|A\hbox{\vbox{\hbox{\hbox{$B$"(B}}}}A| & + A\hbox{\vbox{\hbox{\hbox{$B$"(B}}}}A \\ +\verb|A\vbox{\hbox{\hbox{\hbox{$B$"(B}}}}A| & + A\vbox{\hbox{\hbox{\hbox{$B$"(B}}}}A \\ +\end{tabular} + +\section{$BF|K\8l2=$5$l$F$$$J$$%W%j%_%F%#%V(B} +$B$l$NDj5A$r9T$&$3$H$O$G$-$^$;$s!#(B +\item \cs{lccode}, \cs{uccode}$B$O!"(B2$B%P%$%H%3!<%I$r$=$N$^$^$H$*$7!"(B + $B%m!<%o%1!<%9!"%"%C%Q!<%1!<%9$NJQ99$O9T$$$^$;$s!#(B +\end{itemize} + + +\section{$BLdBjE@(B} +$B8=:_$N%P!<%8%g%s$NF|K\8l(B\TeX $B$K$O!"]$H$J$kJ8;z$rC1$KJ8;z%3!<%I$G$N$_H=CG$7$F$$$^$9!#(B + $B$3$l$O!"(B2$B%P%$%H%3!<%I$NJ8;z$KBP$7$F$OA4$/LdBj$J$$$N$G$9$,!"(B + 1$B%P%$%H%3!<%I$NJ8;z$GLdBj$,@8$8$^$9!#(B + $B$=$l$O!"(B\TeX $B$NJ8;z$,%3!<%I$H0lBP0l$KBP1~$7$F$$$J$$$?$a$G!"(B + $B%U%)%s%H$K$h$j!"FCDj$N%3!<%I$K3d$jIU$1$i$l$F$$$kJ8;z$,(B + $BJQ$C$F$7$^$$$^$9!#(B + $B$?$H$($P!"(B`\{' $B$O%U%)%s%H(Bcmsy$B$N(B66$_{16}$$B$KBP1~IU$1$i$l$F$$$^$9!#(B + 66$_{16}$$B$O!"%"%9%-!<%3!<%I$G(B `f' $B$r<($9$o$1$G$9$+$i6XB'$NBP>]J8;z(B + $B$H$O$J$C$F$$$J$$$O$:$G$9!#(B + + $B$7$?$,$C$F!":#$N$^$^$G$O(B `\{' $B$N$h$&$JJ8;z$KBP$7$F<+F0E*$K6XB'=hM}$d(B + $B%0%k!<$N<+F0A^F~$r9T$&$3$H$OIT2DG=$G$9!#(B +\end{itemize} +%% cmsy $B$N(B \{ $B$O(B 0x6E $B$G$J$/(B 0x66 (2001/08/24) +\end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex 2017-04-17 22:25:33.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtexdoc.tex 1970-01-01 00:00:00.000000000 +0000 @@ -1,403 +0,0 @@ -\def\cs#1{$\backslash$\kern0pt#1} -\def\angle#1{$\langle$\kern0pt#1\kern0pt$\rangle$} -\documentstyle{jarticle} -\begin{document} -\title{$BF|K\8l(B\TeX} -\author{$BARBt(B $BNI0l(B\\ASCII Corporation} -\date{$B>$5$J$1$l$P$J$j$^$;$s!#(B - -$BF|K\8l!J(B2$B%P%$%H%3!<%I%-%c%i%/%?!K$N%O%s%I%j%s%0$K4X$7$F$O!"(B -$B$G$-F@$k8B$j1Q;z!J(B1$B%P%$%H%3!<%I%-%c%i%/%?!K$HF1$8$h$&$Kl9g$N%9%Z!<%7%s%0(B -$B$N=hM}$J$I$,$"$j$^$9!#(B -$BF|K\8l(B\TeX $B$G$O!"$3$l$i$N=hM}$r<+F0E*$K9T$C$F$$$^$9$,!"(B -$B=@Fp@-$r9b$a$k$?$a$K!"$3$&$7$?=hM}$K4X78$9$k%Q%i%a!<%?$r<+M3$K:F@_Dj(B -$B$G$-$k$h$&$K$J$C$F$$$^$9!#(B - -$B%U%)%s%H$K4X$7$F$O!"(B1$B%U%)%s%H$G(BJIS$B%3!<%I$NBh(B1$B?e=`!"Bh(B2$B?e=`A4$F$r(B -$B07$($k$h$&$K3HD%$7$F$"$j$^$9$+$i!"1Q;z%U%)%s%H$HF1$8$h$&$K4A;z%U%)%s%H$r07$(!"(B -JFM(TFM)$B%U%!%$%k$r$D$/$k$3$H$K$h$j!"<+M3$K;HMQ2DG=$J%U%)%s%H$rA}$d$7$F(B -$B$$$/$3$H$,$G$-$^$9!#(B - -DVI$B%U%!%$%k$O!"(BSET2 $B$*$h$S(B PUT2 $B$r;H$C$F(B2$B%P%$%H%3!<%I$r=PNO$7$F$$$k$?$a!"(B -$B$3$l$^$G$N$b$N$H$N8_49@-$OJ]$?$l$F$$$^$9!#(B -$B$^$?(BDVI$B%U%!%$%k$K$O!"(BJIS$B%3!<%I$rMQ$$$F=PNO$7$F$$$^$9!#(B - -\section{$B869F$r=q$/>e$G$NCm0UE@(B} -$B4pK\E*$K$O!"2$J8$HOBJ8$OA4$/F1$8$h$&$K$7$F07$($^$9!#(B -$B$?$@$7!"F|K\8lFCM-$N=hM}5!G=$r;}$?$;$F$$$k$?$a!"(B -$B869F$r=q$/$&$($G$Ol9g$O!"I,$:H>3Q%9%Z!<%9$d%?%VEy$G4V$r6h@Z$C$F$/$@$5$$!#(B -\item $B2$J8$N>l9g!"2~9T$OC18l4V$N%9%Z!<%9$H$7$Fl9g!"869FFb$G$O<+M3$J2U=j$G2~9T$,9T$($?$[$&$,JXMx$G$9!#(B\\ - $B$=$3$GF|K\8l(B\TeX $B$G$O!"(B1$B9T$N=*$o$j$,(B1$B%P%$%H%3!<%I$N>l9g$O%9%Z!<%5!<(B - $B$NA^F~$r9T$$!"(B2$B%P%$%H%3!<%I$N>l9g$O2?$b9T$o$J$$$h$&$K$J$C$F$$$^$9!#(B -\item 2$B%P%$%H%3!<%I%-%c%i%/%?$H(B1$B%P%$%H%3!<%I%-%c%i%/%?$,(B - $BO"B3$9$k>l9g!"<+F0E*$K(B\cs{xkanjiskip}$B$K@_Dj$5$l$F$F$$$k%0%k!<$r(B - $BA^F~$7$^$9!#$?$@$7$3$N=hM}$O!"$I$N(B1$B%P%$%H%3!<%I%-%c%i%/%?$H$N(B - $B4V$G9T$&$+(B\cs{xspcode}$B$K$h$C$F;XDj$G$-!"%G%U%)%k%H$G$O(Ba--z, - A--Z, 0--9$B$H$N4V$G9T$o$l$k$h$&$K@_Dj$5$l$F$$$^$9!#(B - $B$3$N=hM}$rFCDj$N2U=j$G6X;_$7$?$$>l9g$O!"(B - $B$=$3$K(B\cs{kern0pt}$B!"(B\cs{hskip0pt}$B$J$I$rA^F~$7$F$/$@$5$$!#(B -\item $B6XB'=hM}$O!"6XB'$NBP>]$H$J$k%-%c%i%/%?$NA0J}$"$k$$$O(B - $B8eJ}$K%Z%J%k%F%#!<$r<+F0E*$KA^F~$9$k$3$H$G]$N%U%)%s%H$K$"$o$;$F(BJFM(TFM)$B$r:n$l$P;HMQ$G$-$^$9!#(B -\item $B%U%)%s%H$N@Z$j49$($O!"1Q;z$H4A;z$OFHN)$7$F9T$o$l$^$9!#(B - jlatex$B$G$O!"(B\cs{large},\cs{small}$B$J$I%5%$%:JQ99$N(B - $B%3%s%H%m!<%k%7!<%1%s%9$K$h$C$F!"(B - $BO"F0$7$F%U%)%s%H$r%A%'%s%8$9$k$h$&$K$7$F$$$^$9$,!"(B - jtex$B$G$O$=$N$h$&$JA`:n$O0l@Z9T$C$F$$$^$;$s$N$GCm0U$7$F$/$@$5$$!#(B - $B$?$@$7!";XDj$7$?%U%)%s%H$,0u;z$5$l$k$?$a$K$O!"$=$l$i$N;zBN!"%5%$%:$N(B - $B%U%)%s%H$,$=$m$C$F$$$J$1$l$P9T$($^$;$s!#(B - jlatex$B$G$O!"Dj$7$F$$$^$9!#(B - \begin{quote} - min5, min6, min7, min8, min9, min10, - min10 magstephalf, min10 magstep1, - min10 magstep2, min10 magstep3, - min10 magstep4, min10 magstep5, \\ - goth5, goth6, goth7, goth8, goth9, goth10, - goth10 magstephalf, goth10 magstep1, - goth10 magstep2, goth10 magstep3, - goth10 magstep4, goth10 magstep5 - \end{quote} - $B$3$l$i$,!"$-$A$s$H0u;z$5$l$k$+$I$&$+$O%W%j%s%?%I%i%$%P$N@UG$$G$9!#(B - $B$^$?!"$3$l$i$N%U%)%s%H$K$O%+!<%K%s%0!&%Q%i%a!<%?$,@_Dj$5$l$F$$$^$9!#(B - $B%+!<%K%s%0$r9T$$$?$/$J$$>l9g$O!">e5-$N%U%)%s%H$NBe$j$K0J2<$N$b$N$r(B - $B;HMQ$7$F$/$@$5$$!#$3$A$i$N%U%)%s%H$O!"%+!<%K%s%0$N%Q%i%a!<%?$,@_Dj(B - $B$5$l$F$$$J$$$3$H$r=|$$$F>e5-$N$b$N$HA4$/F1$8$b$N$G$9!#(B - \begin{quote} - nmin5, nmin6, nmin7, nmin8, nmin9, nmin10, - nmin10 magstephalf, nmin10 magstep1, - nmin10 magstep2, nmin10 magstep3, - nmin10 magstep4, nmin10 magstep5, \\ - ngoth5, ngoth6, ngoth7, ngoth8, ngoth9, ngoth10, - ngoth10 magstephalf, ngoth10 magstep1, - ngoth10 magstep2, ngoth10 magstep3, - ngoth10 magstep4, ngoth10 magstep5 - \end{quote} -\item $B8=:_$N%P!<%8%g%s$G$O!"A43Q%9%Z!<%9$O$[$+$N4A;z%-%c%i%/%?$HF1$8$h$&$K(B - $B07$o$l$^$9!#(B - $BH>3Q%9%Z!<%9$N$h$&$JFCJL$N=hM}$O9T$C$F$$$^$;$s$N$GCm0U$7$F$/$@$5$$!#(B -\item $B%3%s%H%m!<%k%7!<%1%s%9L>$K$bA43QJ8;z$r;HMQ$9$k$3$H$,$G$-$^$9$,(B - $B3QJ8;z$H:.:_$7$F;HMQ$9$k$3$H$,(B - $B$G$-$^$9!#(B - \end{enumerate} -\item $BH>3Q%+%J$O;H$($^$;$s!#869FFb$KH>3Q%+%J$N%3!<%I$,F~$i$J$$$h$&$K$7(B - $B$F$/$@$5$$!#(B -\end{itemize} - -\section{$BDI2C$5$l$?%W%j%_%F%#%V(B} - -$BF|K\8l(B\TeX $B$K$O$D$.$N%W%j%_%F%#%V$,DI2C$5$l$F$$$^$9!#(B -\begin{itemize} -\item \cs{{\bf kanjiskip}} - \begin{quote} - \cs{kanjiskip}$=$\angle{dimen} - \end{quote} - $BO"B3$9$k(B2$B%P%$%H%3!<%I4V$K<+F0E*$KA^F~$9$k%0%k!<$NCM$r(B - $B3JG<$9$k%l%8%9%?$G$9!#(B - $B$?$@$7!"$3$N=hM}$O(B\cs{autospacing}$B!"(B\cs{noautospacing}$B$K$h$C$F(B - $B9T$&$+9T$o$J$$$+$N;XDj$,$G$-$^$9!#(B\\ - $B$3$N%l%8%9%?$NCM$O!"%Q%i%0%i%U$N=*$o$j$^$?$O(B\cs{hbox}$B$N:G8e$N(B - $B;~E@$Ge(B2$B7e$,6h$r2<(B2$B7e$,E@$G$"$k$H2rA0$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$K$N$_(B - $B%9%Z!<%9$rA^F~$9$k$3$H$r5v2D$7$^$9!#(B - \item 2$B$r@_Dj$9$k$3$H$K$h$jD>8e$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$K$N$_(B - $B%9%Z!<%9$rA^F~$9$k$3$H$r5v2D$7$^$9!#(B - \item 3$B$r@_Dj$9$k$3$H$GA08e$N(B2$B%P%$%H%3!<%IJ8;z$H$N4V$G$N%9%Z!<%9$N(B - $BA^F~$r5v2D$7$^$9!#(B - \end{itemize} - - \noindent - $B;HMQNc(B\\ - {\tt\cs{xspcode}`1=0\\ - \cs{xspcode}`2=3\\ - \cs{xspcode}`;=2}\\ - $B$H$9$k$3$H$K$h$j!"(B`1' $B$KBP$9$k=hM}$r6X;_$7!"(B - `2' $B$KBP$7$FA08e$N=hM}$r5v2D$7$^$9!#(B - $B$^$?!"(B`;' $B$KBP$7$F$OD>8e$X$N%9%Z!<%9$NA^F~$r5v2D$7$^$9!#(B -\item \cs{{\bf inhibitxspcode}} - $B;XDj$7$?(B2$B%P%$%H%3!<%I$H$=$l$KA08e$9$k(B1$B%P%$%H%3!<%I$N4V$K(B - $B<+F0E*$KA^F~$5$l$k%9%Z!<%9$rM^@)$7$^$9!#(B - $B$3$N;XDj$O(B0--3$B$N$$$:$l$+$rA*Br$9$k$3$H$K$h$j(B - $BA0$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$K(B - $B%9%Z!<%9$rA^F~$9$k$3$H$r6X;_$7$^$9!#(B - \item 2$B$r@_Dj$9$k$3$H$K$h$jD>8e$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$K(B - $B%9%Z!<%9$rA^F~$9$k$3$H$r6X;_$7$^$9!#(B - \item 3$B$r@_Dj$9$k$3$H$GA08e$N(B1$B%P%$%H%3!<%IJ8;z$H$N4V$G$N%9%Z!<%9$N(B - $BA^F~$r5v2D$7$^$9!#(B - \end{itemize} - $B$3$N%W%j%_%F%#%V$O!"F|K\8l(B\TeX $B$N%P!<%8%g%s(B1.4$B$GDI2C$7$^$7$?!#(B - - \noindent - $B;HMQNc(B\\ - {\tt\cs{inhibitxspcode}`$B!)(B=0\\ - \cs{inhibitxspcode}`$B!J(B=2\\ - \cs{inhibitxspcode}`$B!K(B=1} -\item \cs{{\bf jcharwidowpenalty}} - \begin{quote} - \cs{jcharwidowpenalty}$=$\angle{number} - \end{quote} - $B%Q%i%0%i%U$N:G8e$NA43QJ8;z$,!"8IN)$7$F2~9T$5$l$k$N$rKI$0$?$a$N(B - $B%Z%J%k%F%#$G$9!#$^$?%Q%i%0%i%U$N:G8e$,(B1$BJ8;z0J>e$N(B1$B6h!"(B2$B6h!"(B7$B6h(B - $B$K4^$^$l$kJ8;z$N>l9g$O!"$=$ND>A0$K$"$kA43QJ8;z$KBP$7$F$3$N(B - $B%Z%J%k%F%#$,;H$o$l$^$9!#(B -\item \cs{{\bf autospacing}} - \begin{quote} - \cs{autospacing} - \end{quote} - $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r5v2D(B - $B$7$^$9!#(B -\item \cs{{\bf noautospacing}} - \begin{quote} - \cs{noautospacing} - \end{quote} - $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r6X;_(B - $B$7$^$9!#(B -\item \cs{{\bf autoxspacing}} - \begin{quote} - \cs{autoxspacing} - \end{quote} - $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I$H(B1$B%P%$%H%3!<%I4V$X$N%0%k!<$N(B - $B<+F0A^F~$r5v2D$7$^$9!#(B -\item \cs{{\bf noautoxspacing}} - \begin{quote} - \cs{noautoxspacing} - \end{quote} - $B$3$N%W%j%_%F%#%V$K$h$C$F(B2$B%P%$%H%3!<%I$H(B1$B%P%$%H%3!<%I4V$X$N%0%k!<$N(B - $B<+F0A^F~$r6X;_$7$^$9!#(B -\item \cs{{\bf prebreakpenalty}} - \begin{quote} - \cs{prebreakpenalty}\angle{16--bit number}$=$\angle{number} - \end{quote} - $B;XDj$9$kJ8;z$NA0J}$KA^F~$9$k%Z%J%k%F%#CM$r@_Dj$7$^$9!#(B - $B$3$N;XDj$O!"9TF,6XB'$N;XDj$K$"$?$j$^$9!#(B - - \noindent - $B;HMQNc(B\\ - {\tt\cs{prebreakpenalty}`$B$"(B$=$1000}\\ - $B$H$9$k$3$H$K$h$j!"(B`$B$"(B' $B$NA0J}$K(B1000$B$N%Z%J%k%F%#CM$,IU$1$i$l$^$9!#(B -\item \cs{{\bf postbreakpenalty}} - \begin{quote} - \cs{postbreakpenalty}\angle{16--bit number}$=$\angle{number} - \end{quote} - $B;XDj$9$kJ8;z$N8eJ}$KA^F~$9$k%Z%J%k%F%#CM$r@_Dj$7$^$9!#(B - $B$3$N;XDj$O!"9TKv6XB'$N;XDj$K$"$?$j$^$9!#(B\\ - $B$?$@$7!"(B\cs{prebreakpenalty}$B$H(B\cs{postbreakpenalty}$B$rF10l$N(B - $BJ8;z$KBP$7$FF1;~$K@_Dj$9$k$3$H$O$G$-$^$;$s!#(B - $BF10l$NJ8;z$KBP$7$FN>J}$N;XDj$r9T$C$?>l9g!"8e$+$i$N@_Dj$,M-8z$K$J$j$^$9!#(B -\item \cs{{\bf jfont}} \\ - $B4pK\E*$JF0:n$O!"(B``\cs{font}'' $B$HF1$8$G$9!#(B - $B$?$@$7!"(B`\cs{showthe}' $B$J$I$N%W%j%_%F%#%V$HAH$_9g$;$?>l9g$K(B - $B%+%l%s%H$N4A;z%U%)%s%H$rJV$7$^$9!#(B - $B%U%)%s%H$NDj5A$O!"(B\cs{font}, \cs{jfont}$B$N$I$A$i$r;H$C$F$b(B - $B1Q;z%U%)%s%H!"4A;z%U%)%s%H$NDj5A$,9T$($^$9!#(B -\item \cs{{\bf jfam}} \\ - `\cs{jfont}' $B$HF1MM$K(B ``\cs{fam}'' $B$H$[$H$s$IF1$8F0:n$r$7$^$9!#(B - `\cs{showthe}' $B$J$I$H$NAH$_9g$;$k$3$H$G!"%+%l%s%H$N4A;z%U%)%s%H(B - $B%U%!%_%j!<$rJV$7$^$9!#(B - $B$?$@$7$3$N%W%j%_%F%#%V$G$O!"1Q;z%U%)%s%H$N%U%!%_%j!<$r(B - $B4A;z%U%!%_%j!<$H$7$FDj5A$G$-$F$7$^$$$^$9$N$GCm0U$7$F$/$@$5$$!#(B -\item {{\bf zw, zh}} \\ - $B%W%j%_%F%#%V$H$O0[$J$j$^$9$,!"(B{\bf em, ex}$B$HF1$8$h$&$K(B - zw$B!"(Bzh$B$O!"$=$l$>$l%+%l%s%H$N(B2$B%P%$%H%3!<%I%U%)%s%H$NI}!JA43QI}!K(B - $B$*$h$S9b$5$NC10L5-9f$G$9!#(B - - \noindent - $B;HMQNc(B\\ - {\tt\cs{baselineskip}$=$1.5zh\\ - \cs{hsize}=20zw}\\ - $B$G%+%l%s%H%U%)%s%H$N9b$5$N(B1.5$BG\$NCM$,(B\cs{baselineskip}$B$KBeF~$5$l!"(B - \cs{hsize}$B$,A43Q(B20$BJ8;zJ,$K@_Dj$5$l$^$9!#(B -\end{itemize} - -\subsection{$B<+F0A^F~$5$l$k%9%Z!<%9$K$D$$$F(B} -\cs{kanjiskip}$B$d(B\cs{xkanjiskip}$B$N<+F0A^F~$O!"C1=c$KO"B3$9$kJ8;zNs$P$+$j$G$J$/(B -shift\_amount$B$,(B0$B$G$"$k(B\cs{hbox}$BFb$NJ8;z$H$NA08e4X78$K$*$$$F$b9T$o$l$^$9!#(B -$B$3$l$O!"(B\cs{hbox}$B$,F~;R>u$K$J$C$F$$$k>l9g$G$bF1$8$G$9!#(B -$B$D$^$j!"$=$N(B\cs{hbox}$BFb$K8=$l$k:G=i$NJ8;z$H:G8e$NJ8;z$H$,!"(B -box$B$NA08e$NJ8;z$KO"B3$9$kJ8;zNs$H$7$F2r]$H$O$J$j$^$;$s!#6qBNE*$K$O0J2<$NNc$r;29M$K$7$F$/$@$5$$!#(B - -\begin{tabular}{l@{ $\longrightarrow$ }c} -\verb|$B$"(B\hbox{A}$B$$(B| & $B$"(B\hbox{A}$B$$(B \\ -\verb|$B$"(B\hbox{\hbox{A}}$B$$(B| & $B$"(B\hbox{\hbox{A}}$B$$(B \\ -\verb|$B$"(B\hbox{\hbox{\hbox{A}}}$B$$(B| & $B$"(B\hbox{\hbox{\hbox{A}}}$B$$(B \\ -\verb|$B$"(B\hbox{\hbox{\hbox{\hbox{A}}}}$B$$(B| & $B$"(B\hbox{\hbox{\hbox{\hbox{A}}}}$B$$(B \\ -\verb|$B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}B}$B$$(B| & - $B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}B}$B$$(B \\ -\verb|$B$"(B\hbox{\hbox{\vbox{\hbox{A}}}B}$B$$(B| & - $B$"(B\hbox{\hbox{\vbox{\hbox{A}}}B}$B$$(B \\ -\verb|$B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}}$B$$(B| & - $B$"(B\hbox{A\hbox{\vbox{\hbox{A}}}}$B$$(B \\ -\verb|$B$"(Bfi$B$$(B| & $B$"(Bfi$B$$(B \\ -\verb|$B$"(B\hbox{\hbox{\vbox{\hbox{A}}}}$B$$(B| & - $B$"(B\hbox{\hbox{\vbox{\hbox{A}}}}$B$$(B \\ -\verb|$B$"(B\hbox{\vbox{\hbox{\hbox{A}}}}$B$$(B| & - $B$"(B\hbox{\vbox{\hbox{\hbox{A}}}}$B$$(B \\ -\verb|$B$"(B\vbox{\hbox{\hbox{\hbox{A}}}}$B$$(B| & - $B$"(B\vbox{\hbox{\hbox{\hbox{A}}}}$B$$(B \\ -\verb|A\hbox{$B$"(B}A| & A\hbox{$B$"(B}A \\ -\verb|A\hbox{\hbox{$B$"(B}}A| & A\hbox{\hbox{$B$"(B}}A \\ -\verb|A\hbox{\hbox{\hbox{$B$"(B}}}A| & A\hbox{\hbox{\hbox{$B$"(B}}}A \\ -\verb|A\hbox{\hbox{\hbox{\hbox{$B$"(B}}}}A| & A\hbox{\hbox{\hbox{\hbox{$B$"(B}}}}A \\ -\verb|A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A| & - A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A \\ -\verb|A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A| & - A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}$B$"(B}A \\ -\verb|A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}}A| & - A\hbox{$B$"(B\hbox{\vbox{\hbox{$B$"(B}}}}A \\ -\verb|A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}}A| & - A\hbox{\hbox{\vbox{\hbox{$B$"(B}}}}A \\ -\verb|A\hbox{\vbox{\hbox{\hbox{$B$"(B}}}}A| & - A\hbox{\vbox{\hbox{\hbox{$B$"(B}}}}A \\ -\verb|A\vbox{\hbox{\hbox{\hbox{$B$"(B}}}}A| & - A\vbox{\hbox{\hbox{\hbox{$B$"(B}}}}A \\ -\end{tabular} - -\section{$BF|K\8l2=$5$l$F$$$J$$%W%j%_%F%#%V(B} -$B$l$NDj5A$r9T$&$3$H$O$G$-$^$;$s!#(B -\item \cs{lccode}, \cs{uccode}$B$O!"(B2$B%P%$%H%3!<%I$r$=$N$^$^$H$*$7!"(B - $B%m!<%o%1!<%9!"%"%C%Q!<%1!<%9$NJQ99$O9T$$$^$;$s!#(B -\end{itemize} - - -\section{$BLdBjE@(B} -$B8=:_$N%P!<%8%g%s$NF|K\8l(B\TeX $B$K$O!"]$H$J$kJ8;z$rC1$KJ8;z%3!<%I$G$N$_H=CG$7$F$$$^$9!#(B - $B$3$l$O!"(B2$B%P%$%H%3!<%I$NJ8;z$KBP$7$F$OA4$/LdBj$J$$$N$G$9$,!"(B - 1$B%P%$%H%3!<%I$NJ8;z$GLdBj$,@8$8$^$9!#(B - $B$=$l$O!"(B\TeX $B$NJ8;z$,%3!<%I$H0lBP0l$KBP1~$7$F$$$J$$$?$a$G!"(B - $B%U%)%s%H$K$h$j!"FCDj$N%3!<%I$K3d$jIU$1$i$l$F$$$kJ8;z$,(B - $BJQ$C$F$7$^$$$^$9!#(B - $B$?$H$($P!"(B`\{' $B$O%U%)%s%H(Bcmsy$B$N(B66$_{16}$$B$KBP1~IU$1$i$l$F$$$^$9!#(B - 66$_{16}$$B$O!"%"%9%-!<%3!<%I$G(B `f' $B$r<($9$o$1$G$9$+$i6XB'$NBP>]J8;z(B - $B$H$O$J$C$F$$$J$$$O$:$G$9!#(B - - $B$7$?$,$C$F!":#$N$^$^$G$O(B `\{' $B$N$h$&$JJ8;z$KBP$7$F<+F0E*$K6XB'=hM}$d(B - $B%0%k!<$N<+F0A^F~$r9T$&$3$H$OIT2DG=$G$9!#(B -\end{itemize} -%% cmsy $B$N(B \{ $B$O(B 0x6E $B$G$J$/(B 0x66 (2001/08/24) -\end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/jtex.tex 2017-08-27 23:51:34.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/jtex.tex 1970-01-01 00:00:00.000000000 +0000 @@ -1,653 +0,0 @@ -\newcommand{\cs}[1]{{$\backslash$#1}} -\documentstyle[twoside]{jarticle} -\addtolength{\textheight}{.5in} -\addtolength{\textwidth}{.7in} -\setlength{\oddsidemargin}{.4in} -\setlength{\evensidemargin}{.4in} -\title{\TeX $B%7%9%F%`$NF|K\8l2=(B} -\author{$BARBt(B $BNI0l(B\\ASCII Corporation} -\date{$B>5CN$7$F$b$i$$$?$$!#(B -$B>0!"K\9F$O$3$NF|K\8l2=$5$l$?(B\TeX $B%7%9%F%`$G(B\LaTeX $B$rMQ$$$F:n@.$7$?!#(B -\end{abstract} -% -\newpage -\tableofcontents -\newpage -%\listoftables -%\newpage -% -\section{\TeX $B%7%9%F%`F|K\8l2=$NJ}?K(B} -\TeX $B%7%9%F%`$rF|K\8l2=$9$k$K$"$?$j!"e$,$j$,H~$7$$$3$H!#(B\\ - \TeX $BK\Mh$NL\E*$G$"$k(B``\.$BH~(B\.$B$7(B\.$B$$(B\.$B=P(B\.$BNO(B''$B$,F@$i$l$J$1$l$P!"(B - $BF|K\8l2=$r9T$&0UL#$OA4$/L5$/$J$C$F$7$^$&!#(B - $B9b@-G=$N=PNO%G%P%$%9$H9bIJ0L$N%U%)%s%H$rMQ$$$k$3$H$K$h$j!"(B - $B$G$"$k!#(B -$BOBJ8$KBP$7$F$b!"2$J8$N$h$&$K<+M3$K%U%)%s%H$r@Z$j49$($?$j!"(B -$B%^%/%mDj5A$,9T$$$?$$$H$$$&$N$OEvA3$G$"$j!"(B -$B$=$l$,(B\TeX $B$N$h$&$JJ8=q=hM}%7%9%F%`$NL%NO$N(B1$B$D$G$"$k$+$i$G$"$k!#(B\\ -2.$B$KIU$$$F$O!"OBJ8$r07$&>l9g$K$OI,A3E*$KIU$$$F$^$o$kLdBj$G!"(B -$B$3$l$i$N=hM}$,3N8:$7$F$7$^$&$H9M$($i$l$k!#(B\\ -3.$B$NFbMF$O>/$7Bg$2$5$J$h$&$K$b;W$($k$,!"(B -Don\nolinebreak\ Knuth$B$N(B\TeX $B3+H/$NL\E*$+$i$9$l$P!";j6KEvA3$N$3$H$G$b$"$k!#(B -$BKt!"$3$l$O(B 1.$B$d(B2.$B$NFbMF$,Bg$-$/4X$o$C$F$$$k$N$O8@$&$^$G$b$J$$$3$H$G$"$k!#(B - -$B$3$N$h$&$JMW5a$r!"=PMh$k8B$jK~B-$9$k$?$a$K(B -$Be5-$NJ}?K$K4p$E$-F|K\8l2=$r9T$C$?7k2L!"8=;~E@$G0J2<$N$h$&$K-Mh$N%Q!<%=%J%k%3%s%T%e!<%?$X$N0\?"Ey$r9M$(9g$o$;$?7k2L!"(B -$BFbIt%3!<%I!"30It%3!<%I6&$K(BASCII$B!"%7%U%H(BJIS$B$NAH$_9g$;$rMQ$$$?!#(B -$B$?$@$7!"(BDVI$B%U%!%$%kFb$N4A;z%3!<%I$@$1$O!"(BJIS$B%3!<%I$r=PNO$9$k$h$&$K$J$C$F$$$k!#(B -$B$^$?H>3Q%+%J$N%5%]!<%H$O9T$C$F$$$J$$!#(B -% -\subsection{$B%W%j%_%F%#%V(B} -$BF|K\8l2=$KH<$$!"4v$D$+$N%W%j%_%F%#%V$NDI2C$*$h$S3HD%$r9T$C$?!#(B -$B$3$l$i$O!"6XB'=hM}!"%*!<%H%9%Z!<%7%s%0$*$h$S4A;z%3!<%I$N$?$a$N$b$N$G$"$k!#(B -$B$3$N;~!"?7$7$/DI2C$9$k%W%j%_%F%#%V$K$D$$$F$O!"F|K\8lFHFC$N?7$7$$=hM}$K(B -$BBP$9$k$b$N$@$1$K;_$a!"=PMh$k$@$14{B8$N%W%j%_%F%#%V$r3HD%$9$k$h$&$KEX$a$?!#(B -% -\subsubsection{$B%W%j%_%F%#%V$NDI2C(B} -\label{tbpri} -Table~\ref{tb:prim}$B$K<($9%W%j%_%F%#%V$,DI2C$5$l$F$$$k!#(B -$B!J>\$7$/$O!"0J9_$N%;%/%7%g%s$G2r@b$9$k!#!K(B -% -\subsubsection{$B%W%j%_%F%#%V$N3HD%(B} -$B4{B8$N%W%j%_%F%#%V$K4X$7$F$O!"=PMhF@$k8B$j2$J8!"OBJ8$N6hJL$r$;$:$K(B -$B07$($k$h$&3HD%$r9T$C$?!#(B -$B$^$?FbIt$G07$&%H!<%/%s$KBP$9$kF|K\8l2=$r9T$&$3$H$K$h$C$F!"(B -$B%W%j%s%F%#%s%0%-%c%i%/%?$N$_$G$J$/!"%^%/%mL>$d%H!<%/%s%j%9%H(B -$B$K$bA43QJ8;z$rH>3QJ8;z$H:.:_$7$F07$($k$h$&$K$J$C$F$$$k!#(B - -\noindent $BNc(B. -\begin{quote} -\cs{char}''82A0\\ -\cs{accent}''5F`$B$"(B\\ -\cs{def}\cs{$B2~%Z!<%8(B}\{\cs{eject}\} -\end{quote} -% -\begin{table}[htb] -\begin{tabular}{|l|p{4in}|} \hline -\cs{\it prebreakpenalty} & - $B;XDj$9$k%-%c%i%/%?%3!<%I$NA0J}$KA^F~$9$k%Z%J%k%F%#$NCM$r@_Dj$9$k!#(B - $B9TF,6XB'$N;XDj$H$7$FMQ$$$k!#(B \\ -& $BNc(B. {\tt\cs{prebreakpenalty}`$B!"(B$=$1000} \\ \hline -\cs{\it postbreakpenalty} & - $B;XDj$9$k%-%c%i%/%?%3!<%I$N8eJ}$KA^F~$9$k%Z%J%k%F%#$NCM$r@_Dj$9$k!#(B - $B9TKv6XB'$N;XDj$H$7$FMQ$$$k!#(B\\ -& $BNc(B. {\tt\cs{postbreakpenalty}`$B!N(B$=$1000} \\ \hline -\cs{\it jis} & - $B4A;z%3!<%I$NJQ49$r9T$&$?$a$N%W%j%_%F%#%V$G!"(B - JIS$B%3!<%I$+$iFbIt%3!<%I$G$"$k%7%U%H(BJIS$B$KJQ49$9$k!#(B\\ -& $BNc(B. {\tt\cs{prebreakpenalty}\cs{jis}"2122$=$1000} \\ \hline -\cs{\it kuten} & - \cs{jis}$B$HF1MM$K6hE@%3!<%I$+$i%7%U%H(BJIS$B$XJQ49$9$k!#(B\\ -& $BNc(B. {\tt\cs{postbreakpenalty}\cs{kuten}"0146$=$1000} \\ \hline -\cs{\it sjis} & - $B>e5-$N#2$D$HF1MM$G$"$k$,!"FbIt%3!<%I$,%7%U%H(BJIS$B$G$"$k$N$G!"(B - $B$=$N$^$^$NCM$r$+$($9!#(B\\ \hline -\cs{\it kanjiskip} & - $BA43Q%3!<%I4V$K<+F0E*$KA^F~$5$l$k%0%k!<$r;}$D%l%8%9%?!#(B\\ -& $BNc(B. {\tt\cs{kanjiskip}$=$0pt puls .3pt minus .3pt} \\ \hline -\cs{\it xkanjiskip} & - $BA43Q(B--$BH>3Q%3!<%I4V$K<+F0E*$KA^F~$5$l$k%0%k!<$r;}$D%l%8%9%?!#(B\\ -& $BNc(B. {\tt\cs{xkanjiskip}$=$2.5pt puls 1pt minus 1pt} \\ \hline -\cs{\it autospacing} & - $BA43Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$&$?$a$N;XDj!#(B \\ \hline -\cs{\it noautospacing} & - $BA43Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$o$J$$$?$a$N;XDj!#(B \\ \hline -\cs{\it autoxspacing} & - $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$&$?$a$N;XDj!#(B\\ \hline -\cs{\it noautoxspacing} & - $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$r9T$o$J$$$?$a$N;XDj!#(B\\ \hline -\cs{\it xspcode} & - $BA43Q(B--$BH>3Q%3!<%I4V$X$N%0%k!<$N<+F0A^F~$NBP>]$H$J$k(B - $BH>3Q%3!<%I$r;XDj$9$k!#(B - $B8=:_%G%U%)%k%H$NCM$H$7$F%"%k%U%!%Y%C%H$*$h$S?t;z$KBP$7$F(B - $B%9%Z!<%9$,A^F~$5$l$k$h$&$K@_Dj$5$l$F$$$k!#(B \\ -& $BNc(B. {\tt\cs{xspcode}`A$=$0} \\ \hline -\end{tabular} -\caption{$BF|K\8l2=$KH<$$DI2C$5$l$?%W%j%_%F%#%V!#(B} -\label{tb:prim} -\end{table} -% -\subsection{$B%i%$%s%V%l!<%/(B} -$B2$J8$HOBJ8$N=hM}$G8+$+$1>e:G$bBg$-$J0c$$$O!"%i%$%s%V%l!<%/=hM}$G$"$k$H;W$o$l$k!#(B -``$B8+$+$1>e(B''$B$H8@$&$N$O!"(B\TeX $BFbIt$N=hM}$K$O(B -$B$5$[$IBg$-$JJQ99$O$$$i$J$$$+$i$G$"$k!#(B -$B6qBNE*$K$O!"]$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$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} -$B\$7$/$O!"(B\TeX: The Program PART38$B!"(B39 Breaking paragraphs into lines. -$B$r@'HsFI$s$G$_$k$3$H$r$*4+$a$9$k!#!K(B -$B$=$3$G!"OBJ8Cf$NJ8;z4V$b%V%l!<%/%]%$%s%H$N8uJd$H$7$F!"(B -{\it try\_break}$B$KEO$9$h$&JQ99$7$?!#(B - -$BKt!"K\Mh$J$i$P%i%$%s%V%l!<%/$N=hM}$O!"e40A4$KJ,$1$F9M$($F$b:9$7;Y$($,$J$$$h$&$J(B -$B9=B$$K$J$C$F$$$k!#(B -$B$=$l$O!"%Z%J%k%F%#$H8F$P$l$k%V%l!<%-%s%0$N$?$a$N(B -$B0lHLE*$JI>2ACM$,F3F~$5$l$F$$$k$?$a$G$"$j!"(B -$B%V%l!<%-%s%0%k!<%A%s$G$O$3$NCM$rG!2?$KI>2A$9$k$+(B -$B$@$1$r9M$($l$PNI$/!"(B -$B6XB'=hM}%k!<%A%s$G$O!"$3$NCM$rG!2?$K@_Dj$9$k$+$@$1$r9M$($l$PNI$$!#(B -% -\subsection{$B6XB'=hM}(B} -% -\subsubsection{$B6XB'=hM}$G$N%Z%J%k%F%#$N1~MQ(B} -$BA0$N%;%/%7%g%s$G$b4JC1$K?($l$?$h$&$K!"(B -$B6XB'=hM}$b(B\TeX $B$K$H$C$FA4$/?7$7$$35G0$G$O$J$/!"(B -$B%Z%J%k%F%#$H8@$&7A$GF3F~$5$l$F$$$k!#(B -$B$3$l$O!">e5-$N%i%$%s%V%l!<%/$d%Z!<%8%V%l!<%/=hM};~$K!"(B -$B$=$N2U=j$,%V%l!<%/%]%$%s%H$H$7$F!"(B -$B$I$NDxEYE,@Z!JIiCM$N%Z%J%k%F%#!K$G$"$k$+$"$k$$$O(B -$BITE,@Z!J@5CM$N%Z%J%k%F%#!K$G$"$k$+$r<($9$?$a$NI>2ACM$G$"$k!#(B -$B$7$?$,$C$F!"$?$@C1$K$=$N2U=j$G$N%V%l!<%-%s%0$r6X;_$9$k$@$1$G$OL5$/!"(B -$B6/@)E*$J%V%l!<%-%s%0$d!"6XB'J8;z$,O"B3$9$k$h$&$J>l9g$N(B -$BM%@h=g0LIU$1$K$bMxMQ$G$-$k!#(B - -$BF|K\8l$N6XB'=hM}$K$3$N%Z%J%k%F%#$r1~MQ$9$k$?$a$K$OpJs$rEPO?$9$kA0$K%Z%J%k%F%#$rA^F~$9$k$3$H$r!"(B -{\bf\cs{post\-break\-penalty}}$B$O(B -$B;XDj$7$?J8;z$ND>8e$K%Z%J%k%F%#$rA^F~$9$k$3$H$r;XDj$9$k$b$N$G!"(B -$BA43QJ8;z!"H>3QJ8;z$N6hJLL5$7$K;XDj$G$-$k!#(B -$B$3$l$i$O!"F10l$NJ8;z$KBP$7$FF1;~$KN>J}$N%Z%J%k%F%#$rA^F~$9$k$h$&$K$O(B -$B;XDj$G$-$J$$!#(B $B$b$7F10l$NJ8;z$KBP$7$FAPJ}$N;XDj$,$5$l$?>l9g!"(B -$B8e$+$i$N$b$N$KCV$-49$($i$l$k!#(B -$BL^O@$3$l$i$O(B``\{\}''$B$K$h$k!"%0%k!<%T%s%05,B'$,E,MQ$5$l$k!#(B -$BKt!"APJ}$G;XDj$G$-$kJ8;z?t$O:GBg$G(B256$BJ8;z$^$G$G$"$k!#(B -$B$3$NCM$O!"A43QJ8;z!"H>3QJ8;z$r9g$o$;$F6XB'BP>]$H$J$k$H9M$($i$l$k(B -$BJ8;z?t$r!"==J,$K%+%P!<$7$F$$$k$H;W$o$l$k!#(B - -$B$3$N6XB'%F!<%V%k$+$i$NEPO?$N:o=|$O!"(B -$B%Z%J%k%F%#CM(B`0'$B$r@_Dj$9$k$3$H$K$h$C$F9T$o$l$k$,!"(B -$B%0%m!<%P%k%l%Y%k$G$N@_Dj$G$J$1$l$P!"(B -$B$3$N%F!<%V%k$NNN0h$O2rJ|$5$l$J$$$3$H$KCm0U$7$FM_$7$$!#(B -$B$J$<$J$i!"%m!<%+%k%l%Y%k$GNN0h$r2rJ|$7$F$7$^$($P!"(B -$B$=$N30B&$N%l%Y%k$KLa$C$?$H$-$K!"$=$N%l%Y%k$G$NCM$r(B -$B:G@_Dj$9$k$?$a$NNN0h$,3NJ]$5$l$F$$$kJ]>Z$,$J$$$+$i$G$"$k!#(B - -$B$3$N%F!<%V%k$,$G$-$l$P!"3FJ8;z$rFI$_9~$`EY$K!"(B -$B$=$NJ8;z$,$3$N%F!<%V%k$KEPO?$5$l$F$$$k$+$I$&$+$rD4$Y!"(B -$BEPO?$5$l$F$$$l$P$=$N%Z%J%k%F%#$rJ8;z$NA08eE,@Z$J0LCV$KA^F~$7$F9T$1$PNI$$!#(B -$B$3$N6XB'%F!<%V%k$N8!:w$K$O%O%C%7%eK!$rMQ$$$F$*$j!"(B -$B%O%C%7%e4X?t$H$7$F(B -\label{`$B%O%C%7%e4X?t(B'} -\[\left\{ \begin{array}{cl} - (C2+(C2<<(C1-0x81)))\,mod 256 & $B4A;z%3!<%I(B\\ - & C1=$B>e0L%P%$%H!"(BC2=$B2<0L%P%$%H(B\\ - \\ - C*2+1 & ASCII$B%3!<%I(B - \end{array} -\right. \] -$B$rMQ$$$F$$$k!#(B -$B$3$l$O!"$*$=$i$/6XB'$NBP>]$H$J$k$G$"$m$&!"(B -$BA43Q$N5-9f!"$R$i$,$J%+%?%+%J$N>.J8;z!"(BASCII$B%3!<%I$N5-9fEy(B -$B$rE,Ev$K;6$i$P$i$;$k$h$&$K9M$($F$"$k!#(B -$BKt!"$3$N%F!<%V%k$K$O:GBg(B256$BJ8;z$^$GEPO?2DG=$G$"$k$,!"(B -$B$`$d$_$KB?$/$NJ8;z$rEPO?$7$F%F!<%V%k$rK~$?$9$3$H$O!"(B -$B6XB'J8;z8!:w$N%*!<%P!<%X%C%I$rBg$-$/$7!"(B -$B%Q%U%)!<%^%s%9$KBg$-$J1F6A$rM?$($k$N$GCm0U$9$kI,MW$,$"$k!#(B - -$B$3$&$7$F%Z%J%k%F%#$rE,@Z$KA^F~$5$($7$F$7$^$($P!"(B -$B8e$O(B\TeX $B$N%i%$%s%V%l!<%/%k!<%A%s$K(B\. $B$*(B\. $B$^(B\. $B$+(B\. $B$;$7$F$7$^$($k!#(B -$BL^O@!"$3$N%F!<%V%k$K$$$+$K%Z%J%k%F%#$rEPO?$9$k$+$O!"(B -$B%f!<%6!<$N@UG$$G$"$k$H6&$K!"%Z%J%k%F%#CM$NJQ99$K$h$j<+M3$K(B -$B6XB'=hM}$KJQ2=$r$D$1$k$3$H$,$G$-$k!#(B -% -\subsection{$B%9%Z!<%7%s%0(B} -{\noautospacing\noautoxspacing -$B$3$l$^$G$NJQ99$G0lDL$j$NOBJ8$r=PNO$9$k$3$H$O2DG=$G$"$k!#(B -$B$H$3$m$,$3$l$@$1$G$O$^$@IT==J,$G!"(B -$B$3$N$^$^$G$O7h$7$F(B\. $BH~(B\. $B$7(B\. $B$$=PNO$OF@$i$l$J$$!#(B -$B$J$<$J$i!"2$J8$G$OC18lKh$K%9%Z!<%9$,A^F~$5$l!"(B -$B$=$3$G$N%9%Z!<%7%s%0NL$rD4@0$9$k$3$H$K$h$j!"(B -$B%8%c%9%F%#%U%!%$%1!<%7%g%s$N=hM}$,9T$o$l$F$$$?!#(B -$B$H$3$m$,!"$3$l$^$G$NJQ99$@$1$G$O!"(B -$BOBJ8$KBP$7$F$=$N$h$&$JD4@0$r9T$&ItJ,$,$[$H$s$IL5$$$N$G$"$k!#(B -$B$3$N>uBV$,$$$C$?$$$I$N$h$&$J$b$N$G$"$k$+(B -$B;n$7$K!"$3$NCJMn$r>e5-$N(B{\it\cs{noautospacing\/}}$B$H(B -{\it\cs{noautoxspacing\/}}$B$K$h$C$F!"%9%Z!<%7%s%0$N<+F0A^F~$r(B -$B$7$J$$$GAH$s$G$_$?!#(B -$B$3$NA`:n$K$K$h$C$F!"$3$NCJMnCf$K$H$i$l$k%9%Z!<%9$O(B -$B%T%j%*%I!"%+%s%^$N8e$N%9%Z!<%9$N$_$G$"$k!#(B\par} - -%\autospacing\autoxspacing -$B0lL\$7$F2r$k$h$&$K!"9TKv$K(B1$BJ8;z0J>e$NITB7$$$,=PMh$F$7$C$^$F$$$k!#(B -$B$3$l$O!"%Q%i%0%i%UA4BN$r%@%$%J%_%C%/$K%V%l!<%-%s%0$9$k$H$$$C$?!"(B -\TeX $B$ND9=j$,0-$$J}$KF/$$$F$7$^$$!"(B -$B?t9T@h$N6XB'=hM}$N1F6A$,$=$N$^$^H?1G$5$l$F$$$k$N$G$"$k!#(B -$B6XB'%Z%J%k%F%#$N%Q%i%a!<%?$NCM$N0-$5$bl9g$G$b$3$N$h$&$J$3$H$O5/$3$i$J$$$h$&$G$"$k!#(B -$B$^$?AH$_I}$O!"A43Q$N@5?tG\$K$H$i$l$k$?$aF|K\8l$N$_$N(B -$B9T$G$OI,$:9TKv$,$-$l$$$KB7$&;E3]$K$J$C$F$$$k!#(B -$B$?$@$7!"6XB'$,@8$8$?$j!"ESCf$K2$J8$,A^F~$5$l$?$j$7$?>l9g$O!"(B -$B$d$O$j$I$3$+$GD4@0$,I,MW$K$J$C$F$/$k!#(B -$B$3$&$7$?D4@0$Ol9g!"DI9~$_$r9M$($k!#(B - $BDI9~$_$N$?$a$K!"%+%s%^!"%T%j%*%I!"3g8LEy$NJ8;z$r(B - $BH>3QI}$K$^$G=L$a$F$_$k!#(B -\item $B$=$l$G$bD4@0$7$-$l$:!"9TCf$K2$J8$,B8:_$9$k>l9g$O!"(B - $B2$J84V!"OBJ8(B--$B2$J84V$N%9%Z!<%9$rD4@0$9$k!#(B -\item $B$5$i$KD4@0$,I,MW$J>l9g$O!"$+$JJ8;z4V$N%9%Z!<%9$r(B - $BD4@0$9$k!#(B -\item $B$3$l$G$b$^$@BLL\$J>l9g!"DI$$=P$7$r;n$_$k!#(B -\end{itemize} -$B@bL@$,CY$l$F$7$^$C$?$,!"OBJ8(B--$B2$J84V$K$O8+1I$($rNI$/$9$k$?$a$K!"(B -4$BJ,3+$1$H8F$P$l$kA43QI}$N(B$1/4$$B$N%9%Z!<%9$,A^F~$5$l$k!#(B -$Be$N%+%s%^!"%T%j%*%I$NN`$NJ8;z$,B8:_$9$l$P!"(B -$B:G=i$NCJ3,$GD4@0$OIU$$$F$7$^$&!#(B - -\subsubsection{\TeX $B$G$N%9%Z!<%7%s%0(B} -$B$3$l$r(B\TeX $B$K1~MQ$9$k$3$H$r9M$($F$_$k!#(B - -$B$^$:AH$_I}$NLdBj$G$"$k$,!"(B\TeX $B$N>l9g!"2?J8;zI}$H$$$C$?(B -$B;XDj$b4JC1$Ko$KLLE]$G$"$k!#(B $B$3$&$7$?N`$N$b$N$O(B -$B@^3Q%3%s%T%e!<%?$r;HMQ$7$F$$$k$N$G$"$k$+$i!"(B -$B<+F0E*$K9T$C$F$[$7$$!#(B - -$B$3$N$h$&$JMW5a$rK~$?$9$?$a$K3QJ8;z4V!K(B - $B$KA^F~$7$FNI$$$o$1$G$O$J$$!#(B - $BNc$($P!"H>3Q$N%T%j%*%I!"%+%s%^!"3g8LN`5-9f$H(B - $BA43QJ8;z4V$K$OM>7W$J%9%Z!<%9$OF~$l$J$$J}$,$h$$!#(B -\item $B%*%j%8%J%k$N(B\TeX $B$G$O!"2~9T%-%c%i%/%?$rFI$_9~$`$3$H$K$h$j(B - $BC18l$N@Z$lL\$HH=CG$7!"%9%Z!<%9$,A^F~$5$l$k!#(B - $B$7$+$7!"OBJ8$G$O$3$&$7$?%9%Z!<%9$rA^F~$5$l$k$N$O(B - $BITET9g$G$"$k!#(B $B$=$3$GA43QJ8;z$N8e$N2~9T$O(B - $B$?$@C1$KFI$_Ht$P$9$@$1$N=hM}$KJQ99$9$kI,MW$,$"$k!#(B -\end{enumerate} - -1.$B$N$N%0%k!<$HF1$8$h$&$K=hM}$7$?$N$G$O!"(B -$BA43QJ8;z(B1$BJ8;z$KIU$-(B1$B%0%k!CHq$9$k$3$H$K$J$j!"(B -$BM>$j$K$b%a%b%j8zN($,0-$/$J$k!#(B $B$=$3$G$3$N%0%k!<$K4X$7$F$O!"(B -$B%i%$%s%V%l!<%/$d!"%\%C%/%9$X$NAH$_9~$_%k!<%A%s(B({\it hpack}) -$BFb$G$NAH$_I}$N7W;;$@$1$G=hM}$9$k$h$&$K$7$F$"$k!#(B - -2.$B$K4X$7$F$O!"(B\TeX $B$,?t<0Cf$G9T$C$F$$$k$h$&$K!"I,MW$J2U=j$K(B -$B3QJ8;z$NFb$N2?$l$KBP$7$F!"(B -$B%9%Z!<%9$rA^F~$9$Y$-$+$r;XDj$9$k$?$a$K!"(B -$BFbIt$K(B128$BJ8;zJ,$N%F!<%V%k$r@_$1!"$=$3$KEPO?$5$l$F$$$k(B -$BFbMF$K$h$C$F%9%Z!<%9A^F~$NM-L5$r7hDj$7$F$$$k!#(B -$B8=:_%G%U%)%k%H$G%"%k%U%!%Y%C%H$*$h$S?t;z$,%9%Z!<%9A^F~$N(B -$BBP>]$H$J$C$F$$$k!#(B $B$3$N%F!<%V%k$X$NEPO?$O!"(B{\bf\cs{xspcode}}$B$H$$$&(B -$B%W%j%_%F%#%V$K$h$C$F9T$&!#(B -$B3F(BASCII$B%-%c%i%/%?$KBP$7$F(B0$B$r@_Dj$9$k$3$H$K$h$j!"(B -$BA43Q$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$7!"$=$l0J30$NCM$G5v2D$9$k$h$&$K$J$C$F$$$k!#(B - -$B>0!"(B1.2.$B$K6&DL$9$k=hM}$H$7$F!"$3$l$i$N%l%8%9%?$NCM$O!"(B -$B$=$N%Q%i%0%i%U!"$"$k$$$O(B{\it hbox}$B$KF~$C$?;~E@$G$NCM$rJ];}$7$F(B -$B;HMQ$7!"$=$NCf$G$I$s$J$KJQ99$r2C$($F$b=hM}$K$O1F6A$,5Z$P$J$$(B -$B$h$&$K$J$C$F$$$k!#(B -$BKt!"$3$l$i$N=hM}$O!"(B{\bf\cs{auto\-spacing}}$B!"(B{\bf\cs{no\-auto\-spacing}}$B!"(B -{\bf\cs{auto\-xspacing}}$B!"(B{\bf\cs{no\-auto\-xspacing}}$B$K$h$C$F(B -ON$B!"(BOFF$B$G$-$k$h$&$K$J$C$F$$$k!#(B - -3.$B$O(B\TeX $B$N%9%-%c%s%K%s%0%k!<%A%s$rJQ99$9$k$3$H$G!"(B -$B%9%Z!<%7%s%0%-%c%i%/%?$H$7$F!"@h$N%k!<%A%s$KEO$C$F9T$+$J$$$h$&$K$7$?!#(B -% -\subsection{$B%U%)%s%H(B} -$B%U%)%s%H$K4X$7$F$b!"$G$-$k$@$12$J8$N$b$N$HF1$807$$$,=PMh$k$h$&$K(B -$BG[N8$7$?!#(B -\subsubsection{\TeX $B$G$NF|K\8l%U%)%s%H$N3QJ8;z$HA43QJ8;z$H$r;H$$J,$1$kEY$K(B -$B%U%)%s%H$N@Z$j49$($r9T$&$N$OHs>o$KHK;($J$N$G!"(B -$B%+%l%s%H%U%)%s%H$H$7$F$3$l$^$G$NH>3QJ8;zMQ$NB>$K(B -$BA43QJ8;zMQ$bFHN)$7$F;}$D$h$&$K$7$?$3$H$G$"$k!#(B -$B$3$l$K$h$C$FFC$K%U%)%s%H$NJQ99$r9T$&I,MW$,$J$1$l$P!"(B -$BA43Q!"H>3Q$N6hJL$r0U<1$9$k$3$H$J$7$K869F$rF~NO$9$k$3$H$,=PMh$k!#(B -$B6qBNE*$K$OeIU$-J8;z$d23Q!"A43Q$r0U<1$9$kI,MW$O$J$$!#(B -$B$?$@A43QMQ%+%l%s%H%U%!%_%j!<$,H>3QMQ$H0[$J$kE@$O!"(B -$BH>3QMQ$N%+%l%s%H%U%!%_%j!<$O!"%^%9%b!<%I$K(B -$B@Z$jBX$o$C$?;~E@$G(B-1$B$K%;%C%H$5$l$k$N$KBP$7!"(B -$BA43QMQ$N%+%l%s%H%U%!%_%j!<$O!"$=$N$^$^$NCM$rJ]$D$3$H$G$"$k!#(B -$B!J%^%9%b!<%ICf$G$N%U%)%s%H@Z$j49$($N%a%+%K%:%`$KIU$$$F$O!"(B -\TeX book p.154$BEy$r;2>H$N$3$H!#!K(B -$B$3$l$O!"?t<04X78$N%U%)%s%HDj5A$rF|K\8l%U%)%s%H$K$^$G(B -$B3HD%$7$F$$$J$$$?$a$NApJs$,CV$+$l$F$$$k!#(B - -\TeX $B$N%i%$%s%V%l!<%/Ey$N=hM}$O!"$3$N(Bchar$B%N!<%ICf$N%-%c%i%/%?%G!<%?$+$i(B -TFM$B%U%!%$%k$N;zI}>pJsEy$r8!:w$7$F=hM}$9$k;EAH$_$K$J$C$F$$$k!#(B -$B$7$?$,$C$F!"(B\TeX $B$rF|K\8l2=$9$k:]$K$O!"$3$l$i$r$I$N$h$&$K(B -$B3HD%$7!"$I$N$h$&$KBP1~IU$1$k$+$,%-!<%]%$%s%H$H$J$k!#(B -% -\subsubsection{TFM$B%U%!%$%k$N3HD%(B} -$B$^$:(BTFM$B%U%!%$%k$G$"$k$,!"$3$NCf$K$O(B{\it char\_info}$B$H8F$P$l$k(B -$B$=$N%U%)%s%HCf$KB8:_$9$k%-%c%i%/%?$N%3!<%I$H(B1$BBP(B1$B$KBP1~$9$k%F!<%V%k$,(B -$BCV$+$l$F$$$k!#(B -$B$3$N%F!<%V%kCf$K$O(B{\it width\/$B!"(Bheight\/$B!"(Bdepth}$BEy$NB>$N%F!<%V%k$X$N(B -$B%$%s%G%C%/%9$,@_Dj$5$l$F$*$j!"$3$N%$%s%G%C%/%9$rMQ$$$F(B -$B$=$l$>$l$N%Q%i%a!<%?$r;2>H$9$k;EAH$_$K$J$C$F$$$k!#(B - -$B$?$@$7!"$3$N%$%s%G%C%/%9$N%5%$%:$+$i!"(B -1$B%U%)%s%HFb$K4^$^$l$k%-%c%i%/%?$N%5%$%:$N$N%F!<%V%k$N;EAH$_$O!"(B -$B$=$N$^$^MxMQ$9$k$3$H$K$7!"(B{\it char\_info}$B%F!<%V%k$H4A;z$N(B2$B%P%$%H%3!<%I$r!"(B -$BBP1~IU$1$k$?$a$NJ}:v$r9M$($k$3$H$K$7$?!#(B - -$B$=$NMh$N(BTFM$B%U%!%$%k$H6hJL$9$k$?$a$K%5%U%#%C%/%9$r(B``{\bf JFM}'' -$B$HJQ99$7$?!#(B -% -\subsubsection{char$B%N!<%I$H(BJFM$B%U%!%$%k$NBP1~IU$1(B} -char$B%N!<%I$O!">e5-$7$?$H$*$j$=$3$K%U%)%s%H$H%-%c%i%/%?%3!<%I$r(B -$B;}$A!"$5$i$Kl9g$KI,MW$K$J$k$@$1$G!"(B -$B0lHL$NFbIt=hM}$G$OFI$_Ht$P$7$F$d$j$5$($9$l$PNI$$!#(B - -$B$"$k(Bchar$B%N!<%I$,F|K\8lMQ$N$b$N$G$"$k$+$I$&$+$O!"(B -char$B%N!<%IFb$N%U%)%s%H$rD4$Y!"$=$l$,4A;z%U%)%s%H$G$"$k$+$I$&$+$K$h$C$F(B -$BH=CG$9$k!#(B -$B$3$N=hM}$r4JC1$KG=N(NI$/9T$&$?$a$K!"(B -$B%U%)%s%H$,4A;z$+$I$&$+$N%F!<%V%k$r(B\TeX $BFbIt$K@_$1$F$"$k!#(B -% -\subsection{$B?t<0Cf$G$NF|K\8l$N;HMQ(B} -$B%U%)%s%H$N9`$G$b4JC1$K?($l$?$H$*$j!"(B -$B?t<0Cf$K$*$$$F$bF|K\8l$,07$($k$h$&$KJQ99$r9T$C$F$"$k!#(B -$B$3$l$O!"?t<0Cf$KD>@\F|K\8l$,4^$^$l$k$h$&$J(B -$B;H$$J}$O4u$G$"$k$,!"(B -\ref{`$B%O%C%7%e4X?t(B'}$BCf$N<0$N$h$&$K!"(B -$B4JC1$J@bL@Ey$rIU$12C$($?$$$3$H$ONI$/$"$k$+$i$G$"$k!#(B -% -\newpage -\section{$B:#8e$NM=Dj(B} -$B8=;~E@$^$G$N(B\TeX $B$NF|K\8l$N>uBV$r0lDL$jI=LLE*$JItJ,$N$_$G(B -$B$"$k$,2r@b$7$F$_$?!#(B -$BL^O@!"$^$@IT==J,$JE@$OB?!9$"$k$,!"(B -$B3Q4V$N%9%Z!<%9$O!"(B - {\bf\cs{kanji\-skip}}$B!"(B{\bf\cs{xkanji\-skip}}$B$NCM$,I,$:(B - $B;H$o$l$F$7$^$&$,!"$3$l$O(BJFM$B%U%!%$%kCf$K!"%G%U%)%k%HCM$r(B - $B@_Dj=PMh$k$h$&$K$7$F!"%U%)%s%H$NJQ99$H6&$K:GE,CM$r(B - $B;HMQ$G$-$k$h$&$K$7$?$$!#(B -\item $BA43Q$N5-9fEy$O!"A43QI}8GDj$G$O$J$/!"4pK\E*$K$O$=$NJ8;z$N;}$D(B - $Bl9g!"(B - $B9T$>$m$($,@53N$K9T$($:(B\. $BH~(B\. $B$7(B\. $B$/(B\. $B$J(B\. $B$$!#(B - $B$3$&$7$?5-9fN`$O4A;z%U%)%s%H$G$"$C$F$b!"(B - $BFH<+$N;zI}>pJs$r;}$D$h$&$K$7$?$$!#(B -\item $BA43QJ8;z$KBP$7$F$b!"J8;z$NAH$_9g$;$K$h$k%+!<%K%s%0$r(B - $B9T$&$Y$-$G$"$k!#(B $BFC$K$R$i$,$J%+%?%+%J$N8e$K!"%T%j%*%I!"(B - $B%+%s%^$NN`$NJ8;z$,B3$$$?>l9g$N!"(B - $B%9%Z!<%9$N6u$-J}$,IT<+A3$J$3$H$,>l9g$,$"$j!"(B - $BD4@0$G$-$k$h$&$K$9$kI,MW$,$"$k!#(B -\end{itemize} -% -%\appendix{TFM$B%U%!%$%k$N9=B$(B} -%\begin{tabular}{|cp{2in}|} \hline -%lf & lh \\ \hline -%bc & ec \\ \hline -%nw & nh \\ \hline -%nd & ni \\ \hline -%nl & nk \\ \hline -%ne & np \\ \hline -%\multicolumn{2}{|c|}{} \\ hline -\newpage -\appendix -\section{$B6XB'%Z%J%k%F%#$N@_DjNc(B} -$B6XB'%Z%J%k%F%#$N@_DjNc$H$7$F!"(B -$B$3$N%F%-%9%H@):n;~$K;HMQ$7$?@_Dj$r>e$2$F$*$/!#(B - -\vspace{15pt} -{\tt\noindent -\begin{tabular}{lll} -%$BH>3QJ8;z(B -\cs{prebreakpenalty}`.=1000 & -\cs{prebreakpenalty}`,=1000 & -\cs{prebreakpenalty}`\}=1000 \\ -\cs{postbreakpenalt}y`\{=1000 & -\cs{prebreakpenalty}`)=1000 & -\cs{postbreakpenalty}`(=1000 \\ -\cs{prebreakpenalty}`]=1000 & -\cs{postbreakpenalty}`[=1000 & -\cs{postbreakpenalty}`!=500 \\ -\cs{postbreakpenalty}`\#=500 & -\cs{postbreakpenalty}`\$=500 & -\cs{postbreakpenalty}`\%=500 \\ -\cs{postbreakpenalty}`\&=500 & -\cs{postbreakpenalty}`\`=500 & -\cs{prebreakpenalty}`|=500 \\ -\cs{prebreakpenalty}`;=500 & -\cs{prebreakpenalty}`?=500 & -\cs{prebreakpenalty}`:=500 \\ -%$BA43QJ8;z(B -\cs{prebreakpenalty}`$B!"(B=1000 & -\cs{prebreakpenalty}`$B!#(B=1000 & -\cs{prebreakpenalty}`$B!$(B=1000 \\ -\cs{prebreakpenalty}`$B!%(B=1000 & -\cs{prebreakpenalty}`$B!&(B=1000 & -\cs{prebreakpenalty}`$B!'(B=500 \\ -\cs{prebreakpenalty}`$B!((B=500 & -\cs{prebreakpenalty}`$B!)(B=500 & -\cs{prebreakpenalty}`$B!*(B=500 \\ -\cs{prebreakpenalty}`$B!K(B=800 & -\cs{postbreakpenalty}`$B!J(B=800 & -\cs{prebreakpenalty}`$B!Q(B=800 \\ -\cs{postbreakpenalty}`$B!P(B=800 & -\cs{prebreakpenalty}`$B!N(B=800 & -\cs{postbreakpenalty}`$B!O(B=800 \\ -\cs{postbreakpenalty}`$B!F(B=1000 & -\cs{prebreakpenalty}`$B!G(B=1000 & -\cs{prebreakpenalty}`$B!<(B=200 \\ -\cs{prebreakpenalty}`$B!\(B=200 & -\cs{prebreakpenalty}`$B!](B=200 & -\cs{prebreakpenalty}`$B!a(B=200 \\ -\cs{postbreakpenalty}`$B!t(B=200 & -\cs{postbreakpenalty}`$B!p(B=200 & -\cs{postbreakpenalty}`$B!s(B=200 \\ -\cs{postbreakpenalty}`$B!u(B=200 & -\cs{prebreakpenalty}`$B$!(B=150 & -\cs{prebreakpenalty}`$B$#(B=150 \\ -\cs{prebreakpenalty}`$B$%(B=150 & -\cs{prebreakpenalty}`$B$'(B=150 & -\cs{prebreakpenalty}`$B$)(B=150 \\ -\cs{prebreakpenalty}`$B$C(B=150 & -\cs{prebreakpenalty}`$B$c(B=150 & -\cs{prebreakpenalty}`$B$e(B=150 \\ -\cs{prebreakpenalty}`$B$g(B=150 & -\cs{prebreakpenalty}`$B%!(B=150 & -\cs{prebreakpenalty}`$B%#(B=150 \\ -\cs{prebreakpenalty}`$B%%(B=150 & -\cs{prebreakpenalty}`$B%'(B=150 & -\cs{prebreakpenalty}`$B%)(B=150 \\ -\cs{prebreakpenalty}`$B%C(B=150 & -\cs{prebreakpenalty}`$B%c(B=150 & -\cs{prebreakpenalty}`$B%e(B=150 \\ -\cs{prebreakpenalty}`$B%g(B=150 \\ -\end{tabular} -\begin{tabular}{ll} -\cs{prebreakpenalty}\cs{jis}"212B=1000 & -\cs{prebreakpenalty}\cs{jis}"212C=1000 \\ -\cs{prebreakpenalty}\cs{jis}"212D=1000 & -\cs{postbreakpenalty}\cs{jis}"212E=1000 \\ -\cs{prebreakpenalty}\cs{jis}"2139=250 & -\cs{prebreakpenalty}\cs{jis}"2144=250 \\ -\cs{prebreakpenalty}\cs{jis}"2145=250 & -\cs{postbreakpenalty}\cs{jis}"2146=1000 \\ -\cs{prebreakpenalty}\cs{jis}"2147=1000 & -\cs{postbreakpenalty}\cs{jis}"2148=1000 \\ -\cs{prebreakpenalty}\cs{jis}"2149=1000 & -\cs{postbreakpenalty}\cs{jis}"214C=800 \\ -\cs{prebreakpenalty}\cs{jis}"214D=800 & -\cs{postbreakpenalty}\cs{jis}"2152=800 \\ -\cs{prebreakpenalty}\cs{jis}"2153=800 & -\cs{postbreakpenalty}\cs{jis}"2154=800 \\ -\cs{prebreakpenalty}\cs{jis}"2155=800 & -\cs{postbreakpenalty}\cs{jis}"2156=800 \\ -\cs{prebreakpenalty}\cs{jis}"2157=800 & -\cs{postbreakpenalty}\cs{jis}"2158=800 \\ -\cs{prebreakpenalty}\cs{jis}"2159=800 & -\cs{postbreakpenalty}\cs{jis}"215A=800 \\ -\cs{prebreakpenalty}\cs{jis}"215B=800 & -\cs{prebreakpenalty}\cs{jis}"246E=150 \\ -\cs{prebreakpenalty}\cs{jis}"256E=150 & -\cs{prebreakpenalty}\cs{jis}"2575=150 \\ -\cs{prebreakpenalty}\cs{jis}"2576=150 \\ -\end{tabular}} - -\end{document} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/LICENSE texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/LICENSE --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/LICENSE 2017-04-17 22:25:33.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/LICENSE 2018-08-18 21:18:32.000000000 +0000 @@ -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 -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/Makefile texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/Makefile --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/Makefile 2017-08-27 23:51:34.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/Makefile 2018-08-18 21:18:32.000000000 +0000 @@ -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 @@ .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) Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexdoc_asciimw.tex 2018-08-18 21:18:32.000000000 +0000 @@ -0,0 +1,924 @@ +\documentstyle{jarticle} + +\$B@>Nq(B + +\title{\TeX $B$N=PHG$X$N1~MQ(B\\ + \large--- $B=DAH$_5!G=$NAH$_9~$_(B ---} +\author{$B_@Ln(B $B>0?M(B\thanks{$B!J3t!K(B\kern-2pt $B%"%9%-!<(B % + $B=PHG6I(B $BEE;RJT=88&5fE}3mIt(B $B=PHG5;=QIt(B} + \and $BEDB<(B $BL@;K(B${}^*$ + \and $BARBt(B $BNI0l(B\thanks{$B!J3t!K(B\kern-2pt $B%"%9%-!<(B % + $B%7%9%F%`%=%U%H%&%'%";v6HIt(B $B5;=QE}3mIt(B $B%*%U%#%9%7%9%F%`5;=QIt(B}} +\date{\ } + +\setlength{\unitlength}{0.1in} + +\def\angle#1{$\langle{}$#1${}\rangle$} +\def\pTeX{p\kern-.2em\TeX} + +\begin{document} + +\maketitle \thispagestyle{empty} + +\begin{abstract} +$BF|K\8l(B\TeX $B$r=PHGJ,Ln$GK\3JE*$K1~MQ$9$k$?$a(B, $B=DAH$_5!G=$rDI2C$7$?(B. +$B3HD%$5$l$?(B\TeX $B$O0J2<$N$h$&$JFCD9$r;}$D(B. +\begin{itemize} +\item $BF10lJ8=q(B, $BF10l%Z!<%8$K=D(B/$B2#AH$_$N:.:_$,$G$-(B, + $B=DAH$_Cf$G$bOB(B/$B2$J8(B/$B?t<0$N:.:_$,2DG=$G$"$k(B. +\item $B1Q8lHG$N%*%j%8%J%k(B\TeX $B$d!J2#AH$_!KF|K\8l(B\TeX $B$H8_49@-$,$"$j(B, + $B=>Mh$N(B\TeX $B$NJ8=q$d%^%/%m$r$=$N$^$^=hM}$9$k$3$H$,$G$-$k(B. +\item $B=DAH$_$r;HMQ$9$k$H(B, $B3HD%%U%)!<%^%C%H$N(B{\tt DVI}$B%U%!%$%k$r=PNO$9$k(B. + $B$?$@$7(B, $B2#AH$_$N$_;HMQ$7$F$$$k>l9g$O(B, + $B=>Mh$N%U%)!<%^%C%H$N(B{\tt DVI}$B%U%!%$%k$r=PNO$9$k(B. +\end{itemize} +$BK\O@J8$G$O$=$N@_7W$HMh$NF|K\8l(B\TeX $B$O1Q8l8~$1$N%7%9%F%`$r%Y!<%9$H$7$F$$$k$?$a(B, +$B=DAH$_(B, $B%k%S$J$I$NF|K\8lFCM-$N5!G=$,$J$$(B. +\TeX $B$r0lHL=q@R$N=PHG$K;HMQ$9$k$?$a$9$k$K$O(B, $B$3$l$i$N5!G=$r;}$C$?(B +$B!VK\3JE*=PHG$KBQ$(F@$kF|K\8l(B\TeX\kern0pt $B!W$,I,MW$G$"$m$&$HH=CG$7(B, +$BF|K\8l(B\TeX $B$N2~B$$KO$+$i(B\ref{output}$B>O$^$G$G(B\pTeX $B$N=DAH$_5!G=$K$D$$$F$N4pK\E*$J35G0$r@bL@$7(B, +\ref{imple}$B>O$G6qBNE*$JMh$N(B\TeX $B$G$O(B, $B%Z!<%8$O(Bvertical$B%\%C%/%9(B, $B9T$O(Bhorizontal$B%\%C%/%9$G$"$j(B, +``$B9TAw$jJ}8~(B'', ``$B;zAw$jJ}8~(B''$B$O2#AH$_MQ$K8GDj$5$l$F$$$?(B. +\pTeX $B$G$O(B, \TeX $B$N>uBV$H$7$F(B``$BAH$_J}8~(B''$B!J%G%#%l%/%7%g%s!K$r9M$((B, +$B%G%#%l%/%7%g%s$K$h$C$F(B`$B9TAw$jJ}8~(B', `$B;zAw$jJ}8~(B'$B$rJQ$($k$3$H$K$7$?(B. +$B=DAH$_$O(B, $B2#AH$_$N(B``$B9TAw$jJ}8~(B'', ``$B;zAw$jJ}8~(B''$B$r(B, +$B1&$K(B$90^\circ$$B2sE>$5$;$?$b$N$HF1$8$K$J$k(B. +\begin{quote} \begin{description} +\item[$B2#AH$_(B] $B;zAw$jJ}8~(B: $B?eJ?1&8~$-(B, $B9TAw$jJ}8~(B: $B?bD>2<8~$-(B +\item[$B=DAH$_(B] $B;zAw$jJ}8~(B: $B?bD>2<8~$-(B, $B9TAw$jJ}8~(B: $B?eJ?:88~$-(B +\end{description} \end{quote} + +$B$^$?(B, $B=DAH$_Cf$G;H$o$l$?>l9g$H2#AH$_Cf$G;H$o$l$?>l9g$G(B +$BF0:n$,JQ$o$k$h$&$J%^%/%m$,=q$1$k$h$&$K(B, +\verb|\iftdir|, \verb|\ifydir|$B$H$$$&%^%/%m$bMQ0U$7$?(B. + +% \TeX $B$NMQ8l$d%W%j%_%F%#%V$K$O>e2<:81&$rO"A[$5$;$kC18l$,B?$/;H$o$l$F$$$k$,(B, +% $B$3$l$i$N>e2<:81&$O:BI87O$K0MB8$9$k$b$N$G$"$k(B. +% \TeX $B$N%W%j%_%F%#%V$K$O(B\begin{quote} +% \verb|\belowdisplayshortskip|, \verb|\belowdisplayskip|, +% \verb|\lower|,\\ +% \verb|\abovedisplayshortskip|, \verb|\abovedisplayskip|, +% \verb|\raise|,\\ +% \verb|\rightskip|, \verb|\moveright|,\\ +% \verb|\leftskip|, \verb|\moveleft| +% \end{quote}$B$N$h$&$J$b$N$b$"$k(B. +% $B$3$l$i$N(B, below, lower$B$O9TAw$jJ}8~(B, above, raise$B$O9TAw$j$N5UJ}8~(B, +% right$B$O;zAw$jJ}8~(B, left$B$O;zAw$j$N5UJ}8~$r0UL#$7$F$$$k$b$N$H$7$F(B, +% $B=DAH$_$G$b$=$N$^$^;HMQ$9$k(B. + + +\section{$B%\%C%/%9(B} + +$B%*%j%8%J%k$N(B\TeX $B$G$O(B, $BJ8;z$rJB$Y$F(B``$B9T(B''$B$N%\%C%/%9$r:n$k%b!<%I$r(Bh$B%b!<%I$H8@$$(B, +$B$G$-$?%\%C%/%9$r(Bh$B%\%C%/%9$H8F$V(B. +$B$3$l$O(B\TeX $B$,%"%a%j%+$G3+H/$5$l$?%7%9%F%`$G$"$j(B, +$B1Q8l$G$OJ8;z$,?eJ?!J(B\kern0pt horizontal\kern0pt $B!K$KJB$V$+$i$G$"$k(B. +$B%G%#%l%/%7%g%s$,2#$N>l9g$O$=$N$^$^$GLdBj$J$$(B. +$B%G%#%l%/%7%g%s$,=D$N>l9g(B, $B9T$NCf$GJ8;z$O?bD>$KJB$V$N$@$,(B, +$B$d$O$j(B, $BJ8;z$rJB$Y$F9T$N%\%C%/%9$r:n$k%b!<%I$r(Bh$B%b!<%I$H8@$$(B, +$B$G$-$?%\%C%/%9$r(Bh$B%\%C%/%9$H8F$V$3$H$K$7$?(B. +$B2#AH$_$H=DAH$_$NN>J}$G;H$($k%^%/%m$r:n$j$d$9$$$h$&$K(B, +`$B2#AH$_$N9T$N%\%C%/%9(B'$B$H(B`$B=DAH$_$N9T$N%\%C%/%9(B'$B$OF1$8L>A0$NJ}$,NI$/(B, +`$B2#AH$_$N9T$N%\%C%/%9(B'$B$O=>Mh$N(Bh$B%\%C%/%9$HF1$8$b$N$@$+$i(B, +$B8_49@-$r9MN8$7$F$=$N$h$&$K$7$?(B. + +$BF1MM$K(B, $B%\%C%/%9$r9TAw$jJ}8~$KJB$Y$k%b!<%I$r(Bv$B%b!<%I(B, +$B$=$l$i$r=8$a$F:n$i$l$?%\%C%/%9$r(Bv$B%\%C%/%9$H8F$V$3$H$K$7$?(B. +$B2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$O%\%C%/%9$O=D!J(B\kern0pt vertical\kern0pt $B!K$KJB$V$,(B, +$B=D%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$O%\%C%/%9$,?eJ?$K1&$+$i:8$XJB$V$3$H$K$J$k(B. + +\TeX $B$r5/F0$7$?D>8e$O2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$"$j(B, +$B%G%#%l%/%7%g%s$rJQ$($J$1$l$P=>Mh$N(B\TeX $B$H8_49@-$,$"$k(B. +$B$D$^$j(B, $B$3$3$GJ8;z$rF~NO$9$k$H2#%G%#%l%/%7%g%s$N(Bh$B%b!<%I$K0\9T$7(B, +$BJ8;z$r:8$+$i1&$KJB$Y$F$$$/(B. +$B%i%$%s%V%l!<%/$K$h$C$F:n$i$l$?(Bh$B%\%C%/%9$O(B, +$B2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G>e$+$i2<$KJB$Y$F$$$/(B. + +\TeX $B$N%G%#%l%/%7%g%s$rJQ99$9$k%W%j%_%F%#%V$H$7$F(B, +\verb|\yoko|, \verb|\tate|$B$rMQ0U$7$?(B. +$B%G%#%l%/%7%g%s$NJQ99$O(B, +$B:n@.Cf$N%j%9%H$d%\%C%/%9$K2?$bF~NO$5$l$F$$$J$$>uBV$G$N$_5v$9$3$H$K$7$?(B. +\TeX $B$r5/F0$7$F2?$bF~NO$5$l$F$$$J$$>uBV$G(B\verb|\tate|$B%W%j%_%F%#%V$re$+$i2<$KJB$Y$F$$$/(B. +$B%i%$%s%V%l!<%/$K$h$C$F:n$i$l$?(Bh$B%\%C%/%9$O(B, +$B=D%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G1&$+$i:8$KJB$Y$F$$$/(B. + +$B%\%C%/%9$NBg$-$5!J%Y!<%9%i%$%s$N0LCV!K$rI=$9MQ8l$H$7$F(B, +\TeX $B$G$O(BWidth, Depth, Height$B$H$$$&8@MU$r;H$C$F$$$k(B. +\pTeX $B$G$O(B, +$B$3$l$i$N8@MU$r(B, $B%\%C%/%9$N;zAw$jJ}8~$NBg$-$5!J(B\kern0pt Width\kern0pt $B!K(B, +$B9TAw$jJ}8~B&$NBg$-$5!J(B\kern0pt Depth\kern0pt $B!K(B, +$B9TAw$jJ}8~$NH?BPB&$NBg$-$5!J(B\kern0pt Height\kern0pt $B!K$G$"$k$HDj5A$7$?(B. +$B$h$C$F(B, $B=D%G%#%l%/%7%g%sCf$N%\%C%/%9$G$O(B, $B%\%C%/%9$N9b$5$r(B$W$$B$H$$$$(B, +$B:8B&$NI}$r(B$D$$B$H$$$$(B, $B1&B&$NI}$r(B$H$$B$H$$$&(B. +\begin{quote} \begin{picture}(50,24)(0,4) + \put(4,26){\makebox(24,0)[b]{$B2#%G%#%l%/%7%g%sCf$N%\%C%/%9(B}} + \put(4,24){\begin{picture}(0,0)(0,0) + \thicklines + \put(0,0){\vector(1,0){6}} + \put(0,0.5){\makebox(6,0)[b]{\small $B;zAw$jJ}8~(B}} + \put(0,0){\vector(0,-11){6}} + \put(0,-6){\makebox(0,0)[t]{\small $B9TAw$jJ}8~(B}} + \end{picture}} + \put(6,6){\begin{picture}(0,0)(0,0) + \thicklines + \put(6,0){\framebox(12,10){}} \put(6,4){\line(1,0){12}} + + \thinlines + \put(0,4){\line(1,0){5}} \put(19,4){\line(1,0){5}} + \put(3,0){\line(1,0){2}} \put(3,10){\line(1,0){2}} + \put(6,11){\line(0,1){2}} \put(18,11){\line(0,1){2}} + + \put(4,0){\vector(0,1){4}} \put(4,0){\vector(0,-1){0}} + \put(3.5,0){\makebox(0,4)[r]{$D$}} + \put(4,10){\vector(0,-1){6}} \put(4,10){\vector(0,1){0}} + \put(3.5,4){\makebox(0,6)[r]{$H$}} + \put(6,12){\vector(1,0){12}} \put(6,12){\vector(-1,0){0}} + \put(6,12.5){\makebox(12,0)[b]{$W$}} + \end{picture}} + \put(35,26){\makebox(18,0)[b]{$B=D%G%#%l%/%7%g%sCf$N%\%C%/%9(B}} + \put(53,24){\begin{picture}(0,0)(0,0) + \thicklines + \put(0,0){\vector(-1,0){6}} + \put(-6,0.5){\makebox(6,0)[b]{\small $B9TAw$jJ}8~(B}} + \put(0,0){\vector(0,-11){6}} + \put(0,-6){\makebox(0,0)[t]{\small $B;zAw$jJ}8~(B}} + \end{picture}} + \put(35,0){\begin{picture}(0,0)(0,0) + \thicklines + \put(0,6){\framebox(10,12){}} \put(4,6){\line(0,1){12}} + + \thinlines + \put(4,19){\line(0,1){5}} \put(4,0){\line(0,1){5}} + \put(0,19){\line(0,1){2}} \put(10,19){\line(0,1){2}} + \put(11,6){\line(1,0){2}} \put(11,18){\line(1,0){2}} + + \put(12,6){\vector(0,1){12}} \put(12,6){\vector(0,-1){0}} + \put(12.5,6){\makebox(0,12)[l]{$W$}} + + \put(4,20){\vector(-1,0){4}} \put(4,20){\vector(1,0){0}} + \put(0,20.5){\makebox(4,0)[b]{$D$}} + \put(4,20){\vector(1,0){6}} \put(4,20){\vector(-1,0){0}} + \put(4,20.5){\makebox(6,0)[b]{$H$}} + \end{picture}} +\end{picture} \end{quote} + +\subsection{$B0[%G%#%l%/%7%g%s$N%\%C%/%9(B} + +$B0l$D$NJ8=q(B, $B0lKg$N%Z!<%8$G$"$C$F$bItJ,$K$h$C$FAH$_J}8~$rJQ$($i$l$k$h$&$K(B, +$BAH$_J}8~$N:.:_$r5v$9$3$H$K$7$?(B. +$B$?$H$($P(B, $BI=$NCf$G9`L\$K$h$C$F=DAH$_(B/$B2#AH$_$r;H$$J,$1$k$3$H$,2DG=$K$J$l$P(B +$BI=8=NO$,A}$9$3$H$K$J$k(B. +$B$^$?(B, $B=DAH$_Cf$G?t7e$N?t$rI=8=$9$k$H$-(B, +$B%"%i%S%"?t;z$r2#AH$_$K$7$F=DAH$_Cf$KA^F~$9$k$3$H$,$"$k(B. +$B$3$l$r=PHG6H3&$G$OO"?t;z$H8@$&$,(B, $B$3$l$bAH$_J}8~$N:.:_5!G=$Go(B, +\verb|\hbox|, \verb|\vbox|$B$,l9g$G(B$W$, $D$, $H$$B$N;;=PJ}K!$,0[$J$k$N$O(B, +$B=DAH$_(B, $B2#AH$_$G$NJ8;z$N07$$$N0c$$!J(B\ref{jfont}$B;2>H!K$rH?1G$7$F$$$k(B. + +\TeX $B$K$O(B256$B8D$N%\%C%/%9%l%8%9%?$,MQ0U$5$l$F$$$F(B +\begin{quote} + \verb|\setbox123\hbox{\yoko |\angle{$BJ8(B}\verb|}| +\end{quote} +$B$H=q$1$P(B, $B%\%C%/%9%l%8%9%?$N(B123$BHV$K(B\angle{$BJ8(B}$B$rFbMF$H$9$k(B +$B2#%G%#%l%/%7%g%s$N(Bh$B%\%C%/%9$,EPO?$5$l$k(B. +$BEPO?$5$l$?%\%C%/%9$O(B +\begin{quote} \begin{verbatim} + \advance\ht123 by \dp123 + \dp123=0 +\end{verbatim} \end{quote} +$B$N$h$&$K(B, \verb|\wd|, \verb|\dp|, \verb|\ht|$B$r;H$C$F(B +$B%\%C%/%9$NBg$-$5$d%Y!<%9%i%$%s$N0LCV$r<+M3$KJQ$($k$3$H$,$G$-$k(B. +\pTeX $B$G$O(B, $B%l%8%9%?$NFbMF$O(B +\begin{quote} \begin{verbatim} + \hbox{\tate\copy123} + \hbox{\yoko\box123} +\end{verbatim} \end{quote} +$B$N$h$&$K$I$N%G%#%l%/%7%g%s$G;HMQ$5$l$k$+$o$+$i$:(B, +$B%\%C%/%9$,;HMQ$5$l$k%G%#%l%/%7%g%s$K$h$C$F(B, $W$, $D$, $H$$B$O0[$J$kCM$r;}$D(B. +$B$=$3$G(B\verb|\wd|$B$J$I$b(B, +$B$=$N$H$-$N%G%#%l%/%7%g%sMQ$N(B$W$$B$J$I$r%"%/%;%9$9$k$3$H$K$7$?(B. +\begin{quote} + \verb|\hbox{\yoko \global\wd123=|\angle{$B=D9b$5(B}\verb|}|\\ + \verb|\hbox{\tate \global\wd123=|\angle{$B2#I}(B}\verb|}|\\ + \verb|\hbox{\tate\copy123}|\\ + \verb|\hbox{\yoko\box123}| +\end{quote} +$B$N$h$&$K=q$1$P(B, 3$B9TL\$N(B\verb|\copy123|$B$N(B$W$$B$O(B\angle{$B=D9b$5(B}$B$G$"$j(B, +4$B9TL\$N(B\verb|\box123|$B$N(B$W$$B$O(B\angle{$B2#I}(B}$B$G$"$k(B. + +$B$3$N>l9gCm0U$7$J$1$l$P$J$i$J$$$N$O(B, +\verb|\hbox|, \verb|\vbox|$B$G:n$i$l$?%\%C%/%9$O(B +$W_t=H_y+D_y$, $W_y=H_t+D_t$$B$G$"$k$,(B, +\verb|\wd|, \verb|\dp|, \verb|\ht|$B$r;H$C$F(B$W$, $D$, $H$$B$rJQ99$9$k$H(B +$B$3$N4X78$OI,$:$7$b@.N)$7$J$$$H$$$&$3$H$G$"$k(B. +$B%G%#%l%/%7%g%s$K$h$C$F%\%C%/%9$NBg$-$5$,JQ2=$9$k$3$H$K$J$k(B. + +\subsection{$B0[%G%#%l%/%7%g%s$N%"%8%c%9%H(B, $B%$%s%5!<%H(B} + +v$B%b!<%I$dFbIt(Bv$B%b!<%I$NCf$N(Bh$B%\%C%/%9$NCf$K(B\verb|\vadjust|$B$r;H$&$H(B, +v$B%j%9%H$N$=$N%\%C%/%9$Nc$J$/(B\verb|vadjust|$B$,;H$($k$h$&$K$7$?(B. +\begin{quote} + $B!J=D%G%#%l%/%7%g%s(B, v$B%b!<%I!K(B\\ + \verb|\hbox{\yoko |\ldots\verb|\vadjust{|\ldots\verb|}|\ldots\verb|}| +\end{quote} +\verb|\vadjust|$B$NCf3g8L$NFbB&$O(B, $B<+F0E*$K(B, +$B$=$l$,%"%8%c%9%H$5$l$k%j%9%H$N%G%#%l%/%7%g%s$G$"$k=D%G%#%l%/%7%g%s$K$J$k(B. + +\verb|\insert|$B$N>l9g(B, $B%/%i%9$K$h$C$F%G%#%l%/%7%g%s$rJQ$($?$$>l9g$b$"$k(B. +$B$?$H$($PJ8=qA4BN$O=DAH$_$G(B, $B5SCm$O2#AH$_$9$k$H$7$h$&(B. +$B?^$r%/%i%9(B12$B$N%$%s%5!<%H$G(B, $B5SCm$r%/%i%9(B34$B$N%$%s%5!<%H$G=hM}$9$k$3$H$K$9$k(B. +\begin{quote} + $B!J=D%G%#%l%/%7%g%s(B, v$B%b!<%I!K(B\\ + \ldots\verb|\insert12{\tate |\ldots\verb|}|\ldots\\ + \ldots\verb|\insert34{\yoko |\ldots\verb|}|\ldots\\ + \ldots\verb|\insert12{\tate |\ldots\verb|}|\ldots\\ + \ldots\verb|\insert34{\yoko |\ldots\verb|}|\ldots +\end{quote} +$B$3$N$h$&$K=q$1$P(B, +$B%\%C%/%9%l%8%9%?(B12$B$K$O=D%G%#%l%/%7%g%s$G?^$,=8$a$i$l(B, +$B%\%C%/%9%l%8%9%?(B34$B$K$O2#%G%#%l%/%7%g%s$G5SCm$,=8$a$i$l$k$h$&$K$7$?(B. +$B$J$*(B, $BF1$8%/%i%9$K0c$&%G%#%l%/%7%g%s$r:.$<$F;H$&$3$H$O$G$-$J$$(B. + + +\section{$B=DAH$_$K;HMQ$9$kJ8;z(B} \label{font} + +\subsection{$B=DAH$_MQF|K\8l%U%)%s%H(B} + +\TeX $B$O3F%U%)%s%H$K0l$D$:$DMQ0U$5$l$F$$$k(B +{\tt TFM}$B!J(B\kern0pt{\it\TeX\/} {\it F\/}ont {\it M\/}etric\kern0pt $B!K%U%!%$%k$r(B +$B;2>H$7$FAHHG$r9T$&(B. +{\tt TFM}$B%U%!%$%k$K$O$=$N%U%)%s%H$K4^$^$l$k3FJ8;z$NBg$-$5$J$I(B +$BAHHG$KI,MW$J>pJs$,Dj5A$7$F$"$k(B. + +\pTeX $B$G$bF1MM$G$"$k$,(B, $BF|K\8l$N%U%)%s%H$N>l9g(B, $BF1$8=qBN$G$b(B +$B=DAH$_$G;H$&$+2#AH$_$G;H$&$+$K$h$C$F(B, $BAHHG$KI,MW$J>pJs$OJQ$o$C$F$/$k(B. +$B$?$H$($P(B, ``$B$j(B''$B$H$$$&J8;z$OHf3SE*=D$KD9$$J8;z$G$"$k$,(B, +$B$3$N$h$&$JJ8;z$O2#AH$_$G$O$H$J$j$NJ8;z$H$N4V3V$r$D$a$FAH$`$3$H$O$G$-$F$b(B, +$B=DAH$_$G$O$"$kDxEY4V3V$r6u$1$J$$$HFI$_$K$/$/$J$C$F$7$^$&(B. +$B$=$3$G(B, $B2#AH$_;~$H=DAH$_;~$G$O(B, +$BJL$N(B\verb|TFM|$B%U%!%$%k$r;2>H$7$FAHHG$9$k$3$H$K$7$?(B. +\TeX $B$+$i8+$k$H(B, $B=DAH$_$H2#AH$_$G$OJL$N%U%)%s%H$r;H$C$F$$$k$h$&$K(B +$B8+$($k$3$H$K$J$k(B. +$B$?$@$7(B, $BAH$_J}8~$K$h$k%U%)%s%H$N@Z$jBX$($O(B, +$B%f!<%6!<$,5$$K$9$kI,MW$,$J$$$h$&$K<+F0E*$K9T$&$h$&$K$7$?(B. +$BOBJ8MQ$N%+%l%s%H%U%)%s%H$r(B2$B$DMQ0U$7(B, +$B%G%#%l%/%7%g%s$K$h$C$F<+F0E*$K@Z$jBX$($k$h$&$K$7$F$"$k(B. +$B$^$?(B{\tt TFM}$B%U%!%$%k$K=DAH$_MQ$+2#AH$_MQ$+$N>pJs$rKd$a9~$_(B, +$B%U%)%s%H$r;XDj$7$?$H$-(B, $B<+F0E*$KE,@Z$J%+%l%s%H%U%)%s%H$r@Z$jBX$($k$h$&$K$7$?(B. + +\label{jfont} +$B2#AH$_$G$O(B, $B%Y!<%9%i%$%s$OJ8;z$N2<$NJ}$rDL$C$F$$$k(B. +$B=DAH$_$NOBJ8%U%)%s%H$O(B, $B%Y!<%9%i%$%s$,J8;z$NCf1{$rDL$k$3$H$K$7$?(B. +$B9T$NESCf$GJ8;z$NBg$-$5$rJQ$($?$H$-(B, $B$=$N$[$&$,<+A3$@$HH=CG$7$?$+$i$G$"$k(B. + +\subsection{$B=DAH$_Cf$N2$J8(B} + +$B=DAH$_$NItJ,$K2$J8$d?t<0$,=P$F$/$k$H(B, +$B=>Mh$N(B\TeX $B$N2$J8MQ%U%)%s%H$r(B$90^\circ$$B2sE>$7$F>e$+$i2<$K8~$+$C$FAH$s$G$$$/(B. +$B$3$l$OIaDL$K2#$KAH$s$@2$J8$r(B, 90$BEY2sE>$5$;$?$h$&$J7k2L$K$J$k(B. +$B$H$3$m$,(B, \ref{jfont}$B$G@bL@$7$?$h$&$K(B, +$B=DAH$_$NOBJ8$N%Y!<%9%i%$%s$OJ8;z$NCf?4$rDL$k$h$&$K$7$?$N$G(B, +$B$=$3$K2$J8$N%Y!<%9%i%$%s$r0lCW$5$;$k$H9T$,$:$l$F8+$($F$7$^$&(B. +$B$=$3$G(B, \verb|\tbaselineshift|$B$H$$$&(Bdimen$BJQ?t$rMQ0U$7(B, +$B$=$N@#K!$@$1=DAH$_Cf$N2$J8$N%Y!<%9%i%$%s$r%7%U%H$5$;$k$3$H$K$7$?(B. + +$B2#AH$_$G$b(B, $BOBJ8$H2$J8$N%Y!<%9%i%$%s$N0LCV$r:Y$+$/D4@a$7$J$$$H(B, +$B%U%)%s%H$N%G%6%$%s$K$h$C$F$O%P%i%s%9$,0-$/$J$k>l9g$,$"$j(B, +\verb|\ybaselineshift|$B$rMQ0U$7$FD4@a2DG=$K$7$?(B. + +\begin{quote} \begin{picture}(0,46) + \put(4,41){\line(0,1){5}} + \put(4,40){\begin{picture}(0,0) + \thicklines + \put(-7,-14){\framebox(14,14){$B=DAH$_$N4A;z(B}} + \put(0,0){\line(0,-1){14}} + + \thinlines + \put(8,0){\line(1,0){2}} \put(8,-14){\line(1,0){2}} + \put(-7,1){\line(0,1){2}} \put(7,1){\line(0,1){2}} + + \put(9,0){\vector(0,-1){14}} \put(9,0){\vector(0,1){0}} + \put(9.5,-14){\makebox(0,14)[l]{$W$}} + \put(0,2){\vector(1,0){7}} \put(0,2){\vector(-1,0){0.0}} + \put(0,2.5){\makebox(7,0)[b]{$H$}} + \put(0,2){\vector(-1,0){7}} \put(0,2){\vector(1,0){0.0}} + \put(-7,2.5){\makebox(7,0)[b]{$D$}} + \end{picture}} + \put(4,19){\line(0,1){6}} \put(0,19){\line(0,1){5}} + \put(0,23){\vector(1,0){4}} \put(0,23){\vector(-1,0){0}} + \put(4.5,23){\makebox(0,0)[l]{\tt \char92 tbaselineshift}} + \put(0,18){\begin{picture}(0,0) + \thicklines + \put(-4,-12){\framebox(12,12){$B1Q;z!J(B$90^\circ$ $B2sE>!K(B}} + \put(0,0){\line(0,-1){12}} + + \thinlines + \put(-4,1){\line(0,1){2}} \put(8,1){\line(0,1){2}} + \put(9,0){\line(1,0){2}} \put(9,-12){\line(1,0){2}} + + \put(-4,2){\vector(1,0){4}} \put(-4,2){\vector(-1,0){0}} + \put(-4,2.5){\makebox(4,0)[b]{$D$}} + \put(0,2){\vector(1,0){8}} \put(0,2){\vector(-1,0){0}} + \put(4,2.5){\makebox(4,0)[b]{$H$}} + \put(10,0){\vector(0,-1){12}} \put(10,0){\vector(0,1){0}} + \put(10.5,0){\makebox(0,-12)[l]{$W$}} + \end{picture}} + \put(4,0){\line(0,1){5}} + + \put(16,8){\line(1,0){5}} + \put(22,8){\begin{picture}(0,0) + \thicklines + \put(0,-2){\framebox(14,14){$B2#AH$_$N4A;z(B}} + \put(0,0){\line(1,0){14}} + + \thinlines + \put(-3,-2){\line(1,0){2}} \put(-3,12){\line(1,0){2}} + \put(0,13){\line(0,1){2}} \put(14,13){\line(0,1){2}} + \put(-2,0){\vector(0,-1){2}} \put(-2,0){\vector(0,1){0}} + \put(-2.5,-2){\makebox(0,2)[r]{$D$}} + \put(-2,0){\vector(0,1){12}} \put(-2,0){\vector(0,-1){0}} + \put(-2.5,0.0){\makebox(0.0,12.0)[r]{$H$}} + \put(0,14){\vector(1,0){14}} \put(0,14){\vector(-1,0){0}} + \put(0,14.5){\makebox(14,0.0)[b]{$W$}} + \end{picture}} + \put(37,8){\line(1,0){6}} \put(38,9){\line(1,0){5}} + \put(39,9){\vector(0,-1){0}} \put(39,8){\vector(0,1){0}} + \put(39,4){\line(0,1){7}} + \put(39,3.5){\makebox(0,0)[t]{\tt \char92 ybaselineshift}} + \put(44,9){\begin{picture}(0,0) + \thicklines + \put(0,-4){\framebox(12,12){$B1Q;z!J@5N)!K(B}} + \put(0,0){\line(1,0){12}} + + \thinlines + \put(-3,-4){\line(1,0){2}} \put(-3,8){\line(1,0){2}} + \put(0,9){\line(0,1){2}} \put(12,9){\line(0,1){2}} + + \put(-2,0){\vector(0,-1){4}} \put(-2,0){\vector(0,1){0}} + \put(-2.5,-4){\makebox(0,4)[r]{$D$}} + \put(-2,0){\vector(0,1){8}} \put(-2,0){\vector(0,-1){0}} + \put(-2.5,0){\makebox(0,8)[r]{$H$}} + \put(0,10){\vector(1,0){12}} \put(0,10){\vector(-1,0){0}} + \put(0,10.5){\makebox(12,0)[b]{$W$}} + \end{picture}} + \put(57,8){\line(1,0){5}} +\end{picture} \end{quote} + + +\section{$B=DAH$_Cf$N?t<0(B} + +$B=DAH$_Cf$N?t<0$b(B, $B2$J8$HF1MM$K%7%U%H$5$;$J$1$l$P$J$i$J$$(B. +\TeX $B$N?t<0$K$O(B, $BJ,?t$N@~$N9b$5$J$I$r7hDj$9$k$?$a$N(B +axis$B!J<4!K$H$$$&35G0$,$"$k$N$G(B, $B$3$l$G%7%U%HNL$r7hDj$9$k$3$H$K$7$?(B. + +$BLdBj$Ol9g$G$"$k(B. +\begin{quote} + $B!J=D%G%#%l%/%7%g%s(B, h$B%b!<%I!K(B\\ + \ldots\verb|$ \hbox{$ |\angle{$B?t<0(B}\verb| $} $|\ldots +\end{quote} +$B$3$N>l9g(B, $B?t<0%b!<%I$,%M%9%F%#%s%0$5$l$k$3$H$K$J$k$N$G(B, +$BFbB&$N(B\angle{$B?t<0(B}$B$O(B2$B2s%7%U%H$5$l$k$3$H$K$J$C$F$7$^$&(B. +$B$3$l$rHr$1$k$?$a(B, \verb|$| $B$NFbB&$O(B, +$BIaDL$N=D%G%#%l%/%7%g%s$G$O$J$$=D?t<0%G%#%l%/%7%g%s$K0\9T$9$k$3$H$K$7$?(B. +$B=D?t<0%G%#%l%/%7%g%s$G$O(B +$BJ8;z$d%\%C%/%9$NJB$VJ}8~$O=D%G%#%l%/%7%g%s$HF1$8$G$"$k$,(B, +$B$=$NB>$NF0:n$O2#AH$_$HF1MM$G$"$k(B. +$B?t<0%G%#%l%/%7%g%sCf$G?t<0%b!<%I$K0\9T$7$F$b%7%U%H$O9T$o$:(B, +$B$^$?(B, $BF|K\8l$N%U%)%s%H$O2#AH$_%+%l%s%H%U%)%s%H$r;HMQ$9$k(B. +$B$D$^$j(B, $B?t<0$O2#AH$_$GAH$s$@$b$N$r;~7W2s$j$K(B90$BEY2sE>$7$F(B, +$B=DAH$_Cf$KA^F~$9$k7A$K$J$k(B. + +$BJX59E*$K(B, $B2#AH$_$G$b?t<0%b!<%I$KF~$k$H2#?t<0%G%#%l%/%7%g%s$KF~$k$3$H$K$7$?(B. +$B8=:_$N%G%#%l%/%7%g%s$,DL>o$N%G%#%l%/%7%g%s$G$"$k$+(B, +$B?t<0%G%#%l%/%7%g%s$G$"$k$+$O(B, \verb|\ifmdir|$B$G%F%9%H$G$-$k(B. + + +\section{$BAHHG7k2L$N=PNO(B} \label{output} + +\TeX $B$O(B\verb|\shipout|$B%W%j%_%F%$%V$G(B, $B%\%C%/%9$N:8>e6y$,;f$N:8>e6y$+$i(B, +$B1&$K(B $\verb|\hoffset|+1$B%$%s%A(B$, +$B2<$K(B $\verb|\voffset|+1$B%$%s%A(B$ $B$N0LCV$K$J$k$h$&$K(B, +{\tt DVI}$B!J(B\kern0pt{\it D\/}e{\it v\/}ice {\it I\/}ndependent\kern0pt $B!K(B +$B%U%!%$%k$K=PNO$9$k(B. +\pTeX $B$bF1MM$G$"$k(B. +\verb|\hoffset|, \verb|\voffset|$B$O(B, $B$[$+$N%W%j%_%F%#%VL>$H0c$C$F(B, +$B%G%#%l%/%7%g%s$K4X78$J$/(B, h, v$B$,K\Ev$K(Bholizontal, vertcal$B$r0UL#$7$F$$$k(B. + +$B=>Mh$N(B\verb|DVI|$BL?Na$O(B, \.$B2#(B\.$BAH(B\.$B$_(B\.$B$N(B\.$B$H(B\.$B$-%U%!%$%k$,>.$5$/$J$k$h$&$K(B +$B9)IW$5$l$F$$$k(B. +$B$?$H$($P(B, ``$BJ8;z$N0u;z(B''$B$H(B``$BJ8;zI}$@$11&$X0\F0(B''$B$,(B, +1$B$D$NL?Na$G$G$-$k$h$&$K$J$C$F$$$k(B. +\pTeX $B$G$O(B, $B=DAH$_$N>l9g$G$b2#AH$_$HF1MM$K%U%!%$%k$,>.$5$/$J$k$h$&$K(B, +\verb|DVI|$B%U%)!<%^%C%H$r3HD%$7$?(B. + +$B$?$@$7(B, $B$?$H$($P=>Mh$NJ8=q$r$3$N(B\TeX $B$G=hM}$7$?>l9g$J$I(B, +$B$=$NJ8=qFb$G=DAH$_$r;HMQ$7$F$$$J$$>l9g(B, +$B=>Mh$N$b$N$HF1$8%U%)!<%^%C%H$N(B{\tt DVI}$B$r=PNO$9$k(B. +$B$^$?(B, $B%W%j%"%s%V%k(B, $B%]%9%H%"%s%V%k$r%F%9%H$9$l$P(B, +$BJ8=qFb$7$?=DAH$_$r;HMQ$7$?2U=j$,B8:_$9$k$+$I$&$+$rCN$k$3$H$,$G$-$k$h$&$K$7$?(B. + + +\section{$B%$%s%W%j%a%s%H(B} \label{imple} + +$B8=:_9=C[Cf$N%j%9%H$N%M%9%F%#%s%0>uBV$r<($9(B +$B%l%3!<%I!J(B\kern0pt {\it list\_state\_record\/}$B!K$K(B, +$B%G%#%l%/%7%g%s$rI=$9%U%#!<%k%I$rDI2C$7(B, +$B%H%C%W$N%G%#%l%/%7%g%s$r%^%/%m(B{\it direction\/}$B$G%"%/%;%9$G$-$k$h$&$K$7$?(B. +{\it direction\/}$B$NCM$O(B{\it dir\_yoko\/}$B$+(B, {\it dir\_tate\/}$B$+(B, +$-{\it dir\_yoko\/}$$B$+(B, $-{\it dir\_tate\/}$$B$G$"$k(B. +$-{\it dir\_yoko\/}$, $-{\it dir\_tate\/}$$B$O?t<0%G%#%l%/%7%g%s$r0UL#$9$k(B. + +$B3Fl9g(B, +$B4V$K(B{\it dir\_node\/}$B$rA^F~$7$F(B, $B%\%C%/%9$NBg$-$5$J$I$r@09g$5$;$k(B. +{\it dir\_node\/}$B$O(B, {\it hlist\_node\/}, {\it vlist\_node\/}$B$H(B +$BA4$/F1$89=B$$r;}$C$F$$$k(B. +$B%j%9%H$K$O$3$N(B{\it dir\_node\/}$B$,A^F~$5$l(B, +{\it dir\_node\/}$B$N(B{\it box\_dir\/}$B$K$O%j%9%H$N%G%#%l%/%7%g%s$,(B, +{\it width\/},{\it depth\/},{\it height\/}$B$K$O(B, +$B%j%9%H$N%G%#%l%/%7%g%s$G8+$?(B, $B%\%C%/%9$N(B$W$, $D$, $H$$B$NCM$,F~$C$F$$$k(B. +{\it dir\_node\/}$B$N(B{\it list\_ptr\/}$B$O<(B'}} + \end{picture}} + \put(10,0){\begin{picture}(0,0) + \put(-4,-3){\framebox(8,4){}} + \put(0,0){\vector(1,0){6}} + \put(0,0){\circle*{0.3}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-3){\makebox(8,2)[c]{`$BOB(B'}} + \end{picture}} + \put(20,0){\begin{picture}(0,0) + \put(-4,-7){\framebox(8,8){}} + \put(-4,-1){\makebox(4,2)[c]{\bf $B=D(B}} + \put( 0,-1){\line(0,1){2}} + \put( 2, 0){\vector(1,0){4}} + \put(2,0){\circle*{0.3}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-5){\makebox(8,4)[c]{\it dir\_node\/}} + \put(-4,-5){\line(1,0){8}} + \put( 0,-6){\circle*{0.3}} + \put( 0,-6){\vector(0,-1){3}} + \end{picture}} + \put(30,0){\begin{picture}(0,0) + \put(-4,-3){\framebox(8,4){}} + \put(-4,-1){\line(4,1){8}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-3){\makebox(8,2)[c]{`$BG/(B'}} + \end{picture}} + + \put(20,-10){\begin{picture}(0,0) + \put(-4,-7){\framebox(8,8){}} + \put(-4,-1){\makebox(4,2)[c]{\bf $B2#(B}} + \put( 0,-1){\line(0,1){2}} + \put( 0,-1){\line(2,1){4}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-5){\makebox(8,4)[c]{\it hlist\_node\/}} + \put(-4,-5){\line(1,0){8}} + \put( 0,-6){\circle*{0.3}} + \put( 0,-6){\vector(0,-1){3}} + \end{picture}} + + \put(20,-20){\begin{picture}(0,0) + \put(-4,-3){\framebox(8,4){}} + \put(0,0){\vector(1,0){6}} + \put(0,0){\circle*{0.3}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-3){\makebox(8,2)[c]{`3'}} + \end{picture}} + \put(30,-20){\begin{picture}(0,0) + \put(-4,-3){\framebox(8,4){}} + \put(-4,-1){\line(4,1){8}} + \put(-4,-1){\line(1,0){8}} + \put(-4,-3){\makebox(8,2)[c]{`8'}} + \end{picture}} +\end{picture}\end{quote} +\begin{quote}\gt\begin{verbatim} + \tmin $B><(B + \tmin $BOB(B + \dirboxT(5.00002+5.00002)x6.44444 + .\hboxY(6.44444+0.0)x10.00003 + ..\tenrm 3 + ..\tenrm 8 + \penalty 500(for \jcharwidowpenalty) + \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 + \tmin $BG/(B +\end{verbatim} \end{quote} + +`\verb|\hbox{|'$B$HF~NO$5$l$k$H(B, +$B$=$l$^$G$N%j%9%H$d%b!<%I$d%G%#%l%/%7%g%s$,%;!<%V$5$l(B, +$B?7$?$J%j%9%H$d%b!<%I$d%G%#%l%/%7%g%s$,MQ0U$5$l$k(B. +\verb|\tate|$B$d(B\verb|\yoko|$B$O(B, +$B$=$N;~E@$G$N%j%9%H$,6u$G$"$l$P%G%#%l%/%7%g%s$rJQ99$9$k(B. +`\verb|\hbox{|'$B$KBP1~$9$k(B`\verb|}|'$B$,F~NO$5$l$k$H(B, +$B$^$:(B, \verb|\hbox{}|$B$NFbIt$N%G%#%l%/%7%g%s$HF1$8%G%#%l%/%7%g%s$N%\%C%/%9$,(B +$B:n$i$l$k(B. +$B$=$N%G%#%l%/%7%g%s$H(B\verb|\hbox{}|$B$N30B&$N%G%#%l%/%7%g%s$,0lCW$7$F$$$J$1$l$P(B, +{\it dir\_node}$B$r;H$C$F(B, $B%G%#%l%/%7%g%s$,@09g$5$;$i$l$k(B. + +\subsection{\it disp\_node} + +$BOBJ8Cf$N2$J8$d?t<0$N%Y!<%9%i%$%s$r%7%U%H$5$;$k$?$a$K(B, +$B?7pJs%o!<%I$N$[$+$K(B +{\it disp\_dimen\/}$B%U%#!<%k%I!J(B1$B%o!<%I!K$r;}$C$F$$$k(B. +{\it disp\_node\/}$B$O(Bh$B%j%9%HCf$K$N$_B8:_$7(B, +$B$3$N%N!<%I0J9_$N$9$Y$F$N%N!<%I$N%Y!<%9%i%$%s$r(B, +{\it disp\_dimen}$B$@$19TAw$jJ}8~$K%7%U%H$5$;$k(B. + +$B$?$H$($P(B, $B=D%G%#%l%/%7%g%s$G(B\verb|\tbaselineshift|$B$NCM$,(B2$B%]%$%s%H$N$H$-(B, +\begin{quote}\gt + \ldots\verb|$B$3$N(Bdisp$B%N!<%I(B|\ldots +\end{quote} +$B$N$h$&$KF~NO$9$k$H(B`\verb|disp|'$B$NA0$K(B2$B%]%$%s%H$N(B{\it disp\_node\/}, +$B8e$K(B0$B%]%$%s%H$N(B{\it disp\_node\/}$B$,A^F~$5$l$k(B. +\begin{quote}\gt\begin{verbatim} + \tmin $B$3(B + \tmin $B$N(B + \displace 2.0 + \glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 + \tenrm d + \tenrm i + \tenrm s + \tenrm p + \displace 0.0 + \glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 + \tmin $B%N(B + \penalty 200(for kinsoku) + \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 + \tmin $B!<(B + \penalty 500(for \jcharwidowpenalty) + \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 + \tmin $B%I(B +\end{verbatim} \end{quote} +$BJ8;z!J(B\kern0pt {\it char\_node\/}$B!K(B, +$B%\%C%/%9!J(B\kern0pt {\it hlist\_node\/}, {\it vlist\_node\/}, {\it dir\_node\/}$B!K(B, +$B7S@~!J(B\kern0pt {\it rule\_node\/}$B!K0J30$N%N!<%I$K$O(B, +$H$$B$d(B$D$$B$,$J$$$N$G(B{\it disp\_node\/}$B$N1F6A$rC$9$h$&$K$7$?(B. +\begin{quote}\gt\begin{verbatim} + .\tmin $B$3(B + .\tmin $B$N(B + .\displace 2.0 + .\glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 + .\tenrm d + .\tenrm v + .\tenrm i + .\glue 3.33333 plus 1.66666 minus 1.11111 + .\tenrm ^^L (ligature fi) + .\tenrm l + .\tenrm e + .\displace 0.0 + .\glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 + .\tmin $B%U(B + .\penalty 150(for kinsoku) + .\glue 1.07391 minus 1.07391 + .\tmin $B%)(B +\end{verbatim} \end{quote} + +\subsection{$B=DAH$_MQ(B{\tt TFM}$B%U%!%$%k(B} + +$B=DAH$_%U%)%s%HMQ3HD%(B{\tt TFM}$B%U%!%$%k$N%U%)!<%^%C%H$O(B, $B4pK\E*$K$O(B, +$B=>Mh$N(B{\tt JFM}$B%U%)!<%^%C%H(B\cite{jfm}$B$HJQ$o$i$J$$(B. +$B$?$@3F%U%#!<%k%I$N0UL#$,B?>/JQ2=$7$F$$$k(B. +$B:G=i$N%O!<%U%o!<%I!J(B\kern0pt {\it id}\kern0pt $B!K$G(B +{\tt JFM}$B%U%)!<%^%C%H$G$"$k$3$H$r<($9(B. +$\hbox{\it id} = 11$ $B$N>l9g$O2#AH$_MQ(B{\tt JFM}, +$\hbox{\it id} = 9$ $B$N>l9g$O=DAH$_MQ(B{\tt JFM}$B$G$"$k(B. + +{\it width}, {\it italic}, {\it kern}, {\it glue}$B$J$I(B +$B=>Mh$N2#AH$_(B{\tt JFM}$B%U%)!<%^%C%H$G2#J}8~$N0UL#$r;}$C$F$$$?%U%#!<%k%I$O(B, +$B=DAH$_(B{\tt JFM}$B$G$O=D!J;zAw$j!KJ}8~$N0UL#$r;}$D(B. +$B$?$H$($P(B{\it width}$B$O$=$NJ8;z$N=DJ}8~$NBg$-$5$G$"$k(B. + +{\it height}, {\it depth}$B$J$I(B +$B=>Mh$N2#AH$_(B{\tt JFM}$B$G=DJ}8~$N0UL#$r;}$C$F$$$?%U%#!<%k%I$O(B, +$B=DAH$_(B{\tt JFM}$B$G$O2#!J9TAw$j!KJ}8~$N0UL#$r;}$D(B. +{\it height}$B$O$=$NJ8;z$N%Y!<%9%i%$%s$N1&B&$NBg$-$5(B, +{\it depth}$B$O$=$NJ8;z$N%Y!<%9%i%$%s$N:8B&$NBg$-$5$G$"$k(B. + +\subsection{$B3HD%(B{\tt DVI}$B%U%)!<%^%C%H(B} + +$B=>Mh$N(B\verb|DVI|$B$K$O?eJ?J}8~$X0\F0$9$kL?Na$H$7$F(B\verb|right|, +$B?bD>J}8~$X0\F0$9$kL?Na$H$7$F(B\verb|down|$B$H$$$&L>A0$,;HMQ$5$l$F$$$k(B. +h$B%\%C%/%9$r(B``$B?eJ?%\%C%/%9(B''$B$G$O$J$/(B``$B;zAw$jJ}8~$N%\%C%/%9(B''$B$HDj5A$7$?$h$&$K(B +\verb|right|$BL?Na$r;zAw$jJ}8~$X0\F0$9$kL?Na(B, +\verb|down|$BL?Na$r9TAw$jJ}8~$X0\F0$9$kL?Na$HDj5A$7$?(B. +$B;zAw$j(B, $B9TAw$j$NJ}8~$O(B, $BAH$_J}8~$K$h$C$FJQ$o$k$N$G(B, +\verb|DVI|$B%j!<%@$K$b%G%#%l%/%7%g%s$r@_$1$F(B, +$B?7$7$$L?Na(B\verb|dir|$B$K$h$C$F%G%#%l%/%7%g%s$r@Z$j49$($k$3$H$K$7$?(B. +\verb|push|, \verb|pop|$B$G(B, $(h,v,w,x,y,z)$$B$NB>$K(B, +$B%G%#%l%/%7%g%s(B$d$$B$b(Bpush, pop$B$9$k(B. + +\verb|DVI|$B$NL?Na$O:G=i$N(B1$B%P%$%H$G<1JL$G$-$k$h$&$K$J$C$F$$$k(B. +$B$9$G$K(B0--249$B$,;HMQ$5$l$F$$$k(B\footnote{ + \TeX $B$r(B, $B1Q8l$J$I$N:8$+$i1&$X=q$/8@8l$H(B, + $B%"%i%S%"8l$d%X%V%i%$8l$N$h$&$K1&$+$i:8$X=q$/8@8l$r(B + $B:.?"$G$-$k$h$&$K2~B$$7$?;vNc(B\cite{arabic}$B$G$O(B, + $B$=$N%$%s%W%j%a%s%H$NJ}K!$H$7$F(B\verb|DVI|$BL?Na$r3HD%$7$F$*$j(B, + 250, 251$B$r;HMQ$7$F$$$k(B. +}$B$N$G?7$7$$L?Na$O(B255$B$r;H$&$3$H$K$7$?(B. +\verb|dir|$B!J(B\kern0pt 255\kern0pt $B!KL?Na$O(B1$B%P%$%H$N0z?t(B$d$$B$r(B1$B$Dl9g$O=>Mh$N(B\verb|DVI|$B$H%3%s%Q%A%V%k$G$"$k$,(B, +$B=D%G%#%l%/%7%g%s$N>l9g$O=>Mh$N(B\verb|DVI|$B$G2#J}8~$K0\F0$9$kL?Na(B +\begin{quote} \begin{verbatim} + set_char_* set? set_rule right? w? x? +\end{verbatim} \end{quote} +$B$O=DJ}8~!J;zAw$jJ}8~!K$K0\F0$9$kL?Na$H$J$j(B, +$B=>Mh$N(B\verb|DVI|$B$G=DJ}8~$K0\F0$9$kL?Na(B +\begin{quote} \begin{verbatim} + down? y? z? +\end{verbatim} \end{quote} +$B$O2#J}8~!J9TAw$jJ}8~!K$K0\F0$9$kL?Na$H$J$k(B. + +$BJ8;z$O(B, $B%Y!<%9%i%$%s$NJ}8~$,;zAw$j$NJ}8~$H0lCW$9$k$h$&$K(B, +$BI,MW$J$i2sE>$7$F(B, $B0u;z$5$l$J$1$l$P$J$i$J$$(B. +$B7S@~$NL?Na$b%G%#%l%/%7%g%s$K$h$C$FJ}8~$,JQ$o$k(B. +$B=>Mh$N(B\verb|set_rule|, \verb|put_rule|$B$G$O(B, +$B:G=i$N0z?t$,9b$5(B, $BHE@$r0\F0$5$;$k(B. + +$B3F%Z!<%8$N@hF,$G$O(B, {\tt DVI}$B%j!<%@$O2#%G%#%l%/%7%g%s$G$"$j(B, +$B3HD%(B\verb|DVI|$BBP1~$N%W%j%s%?%I%i%$%P$G(B, $B=>Mh$N(B\verb|DVI|$B$b%W%j%s%H%"%&%H$G$-(B, +$B3HD%L?Na!J(B\kern0pt \verb|dir|\kern0pt $B!K$r;H$C$F$$$J$$(B\verb|DVI|$B%U%!%$%k$O(B, +$B=>Mh$N%W%j%s%?%I%i%$%P$G%W%j%s%H%"%&%H$G$-$k(B. + +\verb|DVI|$B%U%!%$%k$K$O(B, $B%U%!%$%k$N@hF,!J(B\kern0pt preamble\kern0pt $B!K$H(B +$BKvHx!J(B\kern0pt postamble\kern0pt $B!K$K(B\verb|DVI|$B$N%P!<%8%g%s$rI=$9(B +{\it id\_byte}$B$,=q$-9~$^$l$F$$$k(B. +$B=>Mh$N(B\verb|DVI|$B$G$O$I$A$i$N(B{\it id\_byte}$B$b(B2$B$G$"$k(B. +$B3HD%L?Na$r;H$C$F$$$k(B\verb|DVI|$B%U%!%$%k$G$O(B, postamble$B$N(B{\it id\_byte}$B$r(B3$B$K$7$F(B, +$B3HD%%W%j%s%?%I%i%$%P$G%W%j%s%H%"%&%H$7$J$1$l$P$J$i$J$$$3$H$rI=$9(B. + + +\section{$BF|K\8l(B\TeX $B$H$N8_49@-(B} + +\pTeX $B$O(B, $B5!G=LL$G$O=>Mh$NF|K\8l(B\TeX $B$H$N40A4$J8_49@-$rJ]$C$F$$$k(B. + +$B@-G=LL$G$N0c$$$rHf3S$9$k$?$a$K(B +SONY NEWS 1460$B>e$NF|K\8l(B\TeX $B$H(B\pTeX $B$GK\O@J8$rAHHG$7(B, +csh$B$N(Btime$B%3%^%s%I$G(BCPU$B;~4V$rHf3S$7$F$_$?(B. +$B$J$*$3$N%F%9%H$G$O(B, $B$"$i$+$8$a(Baux$B%U%!%$%k$r:n@.$7$F$*$-(B, +{\tt virtex}$B$K(B\LaTeX $B$N%U%)!<%^%C%H%U%!%$%k$rFI$_9~$^$;$k7A$G5/F0$7$F7WB,$7$?(B. +\begin{itemize} +\item $BF|K\8l(B\TeX $B$N>l9g(B:\\ + \verb|24.7u 0.3s 0:25 99% 44+123k 0+16io 0pf+0w| + +\item \pTeX $B$N>l9g(B:\\ + \verb|25.0u 0.3s 0:25 99% 46+121k 0+16io 0pf+0w| +\end{itemize} + +$B$d$O$jB?>/Ii2Y$O=E$/$J$C$F$$$k$h$&$@$,(B, +$BLs(B1 \%$B$J$N$G$[$H$s$IJQ$C$F$$$J$$$H8@$C$F$$$$$H;W$&(B. +$B$3$l$O(B, \pTeX $B$rF|K\8l(B\TeX $B$NCV$-49$($H$7$F;HMQ$7$F$b(B +$B;Y>c$O$J$$$H$$$&$3$H$r0UL#$7$F$$$k(B. + + +\section{$B$*$o$j$K(B} + +$B:#2s9T$C$?(B\TeX $B$N2~B$$O(B, $BAjEvBg5,LN$J$b$N$G$"$k(B. +$B%"%9%-!o$K6/NO$G(B, +$BAHHG$N=tLdBj$r$[$\2r7h$9$k$3$H$,$G$-$k(B. +$B$3$N4pK\$rF'$_30$5$J$1$l$P(B, \TeX $B$H8F$s$G$$$$$N$G$O$J$$$@$m$&$+(B. + +$B$b$H$b$H(B, \TeX $B%7%9%F%`$O%/%L!<%965e$N%/%*%j%F%#$rF@$k$3$H$rL\I8$K:n$i$l$?%7%9%F%`$G$"$k(B. +\pTeX $B$b(B, $B=>Mh$NF|K\8l$NAHHG$K$D$$$F==J,D4::$7(B, +$B@h?M$N9T$C$F$-$?H~$7$$AHHG$N$?$a$N9)IW$r(B, +$B$G$-$k8B$jl9g$O(B, + \TeX $BK\BN$N%9%Z!<%7%s%0%"%k%4%j%:%`$KJQ99$r(B + $B2C$($J$1$l$P$J$i$J$$$+$b$7$l$J$$(B. + +\item[$B4A;z!&%+%JJL%U%)%s%H(B]\ \\ + $BO$rAH$`(B. + $B%+%J$N=qBN$rJQ$($?$@$1$G$b$+$J$jJ70O5$$,JQ$o$k$b$N$G$"$k(B. + + $B$3$l$r(B\TeX $B$Gl9g$,$"$k$N$G(B, + $B%i%$%s%V%l!<%/=hM}$K;?.(B $BE}3mItD9(B, +$BF1(B $B5;=QE}3mIt(B $B;01:2m9'(B $BE}3mItD9(B, +$B$J$i$S$K(B, \TeX $B%7%9%F%`$K$D$$$F5.=E$J$40U8+$r$$$?$@$$$?(B $BF1(B $B5;=QIt(B $BBgLn=S<#(B $BNq(B - -\title{\TeX $B$N=PHG$X$N1~MQ(B\\ - \large--- $B=DAH$_5!G=$NAH$_9~$_(B ---} -\author{$B_@Ln(B $B>0?M(B\thanks{$B!J3t!K(B\kern-2pt $B%"%9%-!<(B % - $B=PHG6I(B $BEE;RJT=88&5fE}3mIt(B $B=PHG5;=QIt(B} - \and $BEDB<(B $BL@;K(B${}^*$ - \and $BARBt(B $BNI0l(B\thanks{$B!J3t!K(B\kern-2pt $B%"%9%-!<(B % - $B%7%9%F%`%=%U%H%&%'%";v6HIt(B $B5;=QE}3mIt(B $B%*%U%#%9%7%9%F%`5;=QIt(B}} -\date{\ } - -\setlength{\unitlength}{0.1in} - -\def\angle#1{$\langle{}$#1${}\rangle$} -\def\pTeX{p\kern-.2em\TeX} - -\begin{document} - -\maketitle \thispagestyle{empty} - -\begin{abstract} -$BF|K\8l(B\TeX $B$r=PHGJ,Ln$GK\3JE*$K1~MQ$9$k$?$a(B, $B=DAH$_5!G=$rDI2C$7$?(B. -$B3HD%$5$l$?(B\TeX $B$O0J2<$N$h$&$JFCD9$r;}$D(B. -\begin{itemize} -\item $BF10lJ8=q(B, $BF10l%Z!<%8$K=D(B/$B2#AH$_$N:.:_$,$G$-(B, - $B=DAH$_Cf$G$bOB(B/$B2$J8(B/$B?t<0$N:.:_$,2DG=$G$"$k(B. -\item $B1Q8lHG$N%*%j%8%J%k(B\TeX $B$d!J2#AH$_!KF|K\8l(B\TeX $B$H8_49@-$,$"$j(B, - $B=>Mh$N(B\TeX $B$NJ8=q$d%^%/%m$r$=$N$^$^=hM}$9$k$3$H$,$G$-$k(B. -\item $B=DAH$_$r;HMQ$9$k$H(B, $B3HD%%U%)!<%^%C%H$N(B{\tt DVI}$B%U%!%$%k$r=PNO$9$k(B. - $B$?$@$7(B, $B2#AH$_$N$_;HMQ$7$F$$$k>l9g$O(B, - $B=>Mh$N%U%)!<%^%C%H$N(B{\tt DVI}$B%U%!%$%k$r=PNO$9$k(B. -\end{itemize} -$BK\O@J8$G$O$=$N@_7W$HMh$NF|K\8l(B\TeX $B$O1Q8l8~$1$N%7%9%F%`$r%Y!<%9$H$7$F$$$k$?$a(B, -$B=DAH$_(B, $B%k%S$J$I$NF|K\8lFCM-$N5!G=$,$J$$(B. -\TeX $B$r0lHL=q@R$N=PHG$K;HMQ$9$k$?$a$9$k$K$O(B, $B$3$l$i$N5!G=$r;}$C$?(B -$B!VK\3JE*=PHG$KBQ$(F@$kF|K\8l(B\TeX\kern0pt $B!W$,I,MW$G$"$m$&$HH=CG$7(B, -$BF|K\8l(B\TeX $B$N2~B$$KO$+$i(B\ref{output}$B>O$^$G$G(B\pTeX $B$N=DAH$_5!G=$K$D$$$F$N4pK\E*$J35G0$r@bL@$7(B, -\ref{imple}$B>O$G6qBNE*$JMh$N(B\TeX $B$G$O(B, $B%Z!<%8$O(Bvertical$B%\%C%/%9(B, $B9T$O(Bhorizontal$B%\%C%/%9$G$"$j(B, -``$B9TAw$jJ}8~(B'', ``$B;zAw$jJ}8~(B''$B$O2#AH$_MQ$K8GDj$5$l$F$$$?(B. -\pTeX $B$G$O(B, \TeX $B$N>uBV$H$7$F(B``$BAH$_J}8~(B''$B!J%G%#%l%/%7%g%s!K$r9M$((B, -$B%G%#%l%/%7%g%s$K$h$C$F(B`$B9TAw$jJ}8~(B', `$B;zAw$jJ}8~(B'$B$rJQ$($k$3$H$K$7$?(B. -$B=DAH$_$O(B, $B2#AH$_$N(B``$B9TAw$jJ}8~(B'', ``$B;zAw$jJ}8~(B''$B$r(B, -$B1&$K(B$90^\circ$$B2sE>$5$;$?$b$N$HF1$8$K$J$k(B. -\begin{quote} \begin{description} -\item[$B2#AH$_(B] $B;zAw$jJ}8~(B: $B?eJ?1&8~$-(B, $B9TAw$jJ}8~(B: $B?bD>2<8~$-(B -\item[$B=DAH$_(B] $B;zAw$jJ}8~(B: $B?bD>2<8~$-(B, $B9TAw$jJ}8~(B: $B?eJ?:88~$-(B -\end{description} \end{quote} - -$B$^$?(B, $B=DAH$_Cf$G;H$o$l$?>l9g$H2#AH$_Cf$G;H$o$l$?>l9g$G(B -$BF0:n$,JQ$o$k$h$&$J%^%/%m$,=q$1$k$h$&$K(B, -\verb|\iftdir|, \verb|\ifydir|$B$H$$$&%^%/%m$bMQ0U$7$?(B. - -% \TeX $B$NMQ8l$d%W%j%_%F%#%V$K$O>e2<:81&$rO"A[$5$;$kC18l$,B?$/;H$o$l$F$$$k$,(B, -% $B$3$l$i$N>e2<:81&$O:BI87O$K0MB8$9$k$b$N$G$"$k(B. -% \TeX $B$N%W%j%_%F%#%V$K$O(B\begin{quote} -% \verb|\belowdisplayshortskip|, \verb|\belowdisplayskip|, -% \verb|\lower|,\\ -% \verb|\abovedisplayshortskip|, \verb|\abovedisplayskip|, -% \verb|\raise|,\\ -% \verb|\rightskip|, \verb|\moveright|,\\ -% \verb|\leftskip|, \verb|\moveleft| -% \end{quote}$B$N$h$&$J$b$N$b$"$k(B. -% $B$3$l$i$N(B, below, lower$B$O9TAw$jJ}8~(B, above, raise$B$O9TAw$j$N5UJ}8~(B, -% right$B$O;zAw$jJ}8~(B, left$B$O;zAw$j$N5UJ}8~$r0UL#$7$F$$$k$b$N$H$7$F(B, -% $B=DAH$_$G$b$=$N$^$^;HMQ$9$k(B. - - -\section{$B%\%C%/%9(B} - -$B%*%j%8%J%k$N(B\TeX $B$G$O(B, $BJ8;z$rJB$Y$F(B``$B9T(B''$B$N%\%C%/%9$r:n$k%b!<%I$r(Bh$B%b!<%I$H8@$$(B, -$B$G$-$?%\%C%/%9$r(Bh$B%\%C%/%9$H8F$V(B. -$B$3$l$O(B\TeX $B$,%"%a%j%+$G3+H/$5$l$?%7%9%F%`$G$"$j(B, -$B1Q8l$G$OJ8;z$,?eJ?!J(B\kern0pt horizontal\kern0pt $B!K$KJB$V$+$i$G$"$k(B. -$B%G%#%l%/%7%g%s$,2#$N>l9g$O$=$N$^$^$GLdBj$J$$(B. -$B%G%#%l%/%7%g%s$,=D$N>l9g(B, $B9T$NCf$GJ8;z$O?bD>$KJB$V$N$@$,(B, -$B$d$O$j(B, $BJ8;z$rJB$Y$F9T$N%\%C%/%9$r:n$k%b!<%I$r(Bh$B%b!<%I$H8@$$(B, -$B$G$-$?%\%C%/%9$r(Bh$B%\%C%/%9$H8F$V$3$H$K$7$?(B. -$B2#AH$_$H=DAH$_$NN>J}$G;H$($k%^%/%m$r:n$j$d$9$$$h$&$K(B, -`$B2#AH$_$N9T$N%\%C%/%9(B'$B$H(B`$B=DAH$_$N9T$N%\%C%/%9(B'$B$OF1$8L>A0$NJ}$,NI$/(B, -`$B2#AH$_$N9T$N%\%C%/%9(B'$B$O=>Mh$N(Bh$B%\%C%/%9$HF1$8$b$N$@$+$i(B, -$B8_49@-$r9MN8$7$F$=$N$h$&$K$7$?(B. - -$BF1MM$K(B, $B%\%C%/%9$r9TAw$jJ}8~$KJB$Y$k%b!<%I$r(Bv$B%b!<%I(B, -$B$=$l$i$r=8$a$F:n$i$l$?%\%C%/%9$r(Bv$B%\%C%/%9$H8F$V$3$H$K$7$?(B. -$B2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$O%\%C%/%9$O=D!J(B\kern0pt vertical\kern0pt $B!K$KJB$V$,(B, -$B=D%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$O%\%C%/%9$,?eJ?$K1&$+$i:8$XJB$V$3$H$K$J$k(B. - -\TeX $B$r5/F0$7$?D>8e$O2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G$"$j(B, -$B%G%#%l%/%7%g%s$rJQ$($J$1$l$P=>Mh$N(B\TeX $B$H8_49@-$,$"$k(B. -$B$D$^$j(B, $B$3$3$GJ8;z$rF~NO$9$k$H2#%G%#%l%/%7%g%s$N(Bh$B%b!<%I$K0\9T$7(B, -$BJ8;z$r:8$+$i1&$KJB$Y$F$$$/(B. -$B%i%$%s%V%l!<%/$K$h$C$F:n$i$l$?(Bh$B%\%C%/%9$O(B, -$B2#%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G>e$+$i2<$KJB$Y$F$$$/(B. - -\TeX $B$N%G%#%l%/%7%g%s$rJQ99$9$k%W%j%_%F%#%V$H$7$F(B, -\verb|\yoko|, \verb|\tate|$B$rMQ0U$7$?(B. -$B%G%#%l%/%7%g%s$NJQ99$O(B, -$B:n@.Cf$N%j%9%H$d%\%C%/%9$K2?$bF~NO$5$l$F$$$J$$>uBV$G$N$_5v$9$3$H$K$7$?(B. -\TeX $B$r5/F0$7$F2?$bF~NO$5$l$F$$$J$$>uBV$G(B\verb|\tate|$B%W%j%_%F%#%V$re$+$i2<$KJB$Y$F$$$/(B. -$B%i%$%s%V%l!<%/$K$h$C$F:n$i$l$?(Bh$B%\%C%/%9$O(B, -$B=D%G%#%l%/%7%g%s$N(Bv$B%b!<%I$G1&$+$i:8$KJB$Y$F$$$/(B. - -$B%\%C%/%9$NBg$-$5!J%Y!<%9%i%$%s$N0LCV!K$rI=$9MQ8l$H$7$F(B, -\TeX $B$G$O(BWidth, Depth, Height$B$H$$$&8@MU$r;H$C$F$$$k(B. -\pTeX $B$G$O(B, -$B$3$l$i$N8@MU$r(B, $B%\%C%/%9$N;zAw$jJ}8~$NBg$-$5!J(B\kern0pt Width\kern0pt $B!K(B, -$B9TAw$jJ}8~B&$NBg$-$5!J(B\kern0pt Depth\kern0pt $B!K(B, -$B9TAw$jJ}8~$NH?BPB&$NBg$-$5!J(B\kern0pt Height\kern0pt $B!K$G$"$k$HDj5A$7$?(B. -$B$h$C$F(B, $B=D%G%#%l%/%7%g%sCf$N%\%C%/%9$G$O(B, $B%\%C%/%9$N9b$5$r(B$W$$B$H$$$$(B, -$B:8B&$NI}$r(B$D$$B$H$$$$(B, $B1&B&$NI}$r(B$H$$B$H$$$&(B. -\begin{quote} \begin{picture}(50,24)(0,4) - \put(4,26){\makebox(24,0)[b]{$B2#%G%#%l%/%7%g%sCf$N%\%C%/%9(B}} - \put(4,24){\begin{picture}(0,0)(0,0) - \thicklines - \put(0,0){\vector(1,0){6}} - \put(0,0.5){\makebox(6,0)[b]{\small $B;zAw$jJ}8~(B}} - \put(0,0){\vector(0,-11){6}} - \put(0,-6){\makebox(0,0)[t]{\small $B9TAw$jJ}8~(B}} - \end{picture}} - \put(6,6){\begin{picture}(0,0)(0,0) - \thicklines - \put(6,0){\framebox(12,10){}} \put(6,4){\line(1,0){12}} - - \thinlines - \put(0,4){\line(1,0){5}} \put(19,4){\line(1,0){5}} - \put(3,0){\line(1,0){2}} \put(3,10){\line(1,0){2}} - \put(6,11){\line(0,1){2}} \put(18,11){\line(0,1){2}} - - \put(4,0){\vector(0,1){4}} \put(4,0){\vector(0,-1){0}} - \put(3.5,0){\makebox(0,4)[r]{$D$}} - \put(4,10){\vector(0,-1){6}} \put(4,10){\vector(0,1){0}} - \put(3.5,4){\makebox(0,6)[r]{$H$}} - \put(6,12){\vector(1,0){12}} \put(6,12){\vector(-1,0){0}} - \put(6,12.5){\makebox(12,0)[b]{$W$}} - \end{picture}} - \put(35,26){\makebox(18,0)[b]{$B=D%G%#%l%/%7%g%sCf$N%\%C%/%9(B}} - \put(53,24){\begin{picture}(0,0)(0,0) - \thicklines - \put(0,0){\vector(-1,0){6}} - \put(-6,0.5){\makebox(6,0)[b]{\small $B9TAw$jJ}8~(B}} - \put(0,0){\vector(0,-11){6}} - \put(0,-6){\makebox(0,0)[t]{\small $B;zAw$jJ}8~(B}} - \end{picture}} - \put(35,0){\begin{picture}(0,0)(0,0) - \thicklines - \put(0,6){\framebox(10,12){}} \put(4,6){\line(0,1){12}} - - \thinlines - \put(4,19){\line(0,1){5}} \put(4,0){\line(0,1){5}} - \put(0,19){\line(0,1){2}} \put(10,19){\line(0,1){2}} - \put(11,6){\line(1,0){2}} \put(11,18){\line(1,0){2}} - - \put(12,6){\vector(0,1){12}} \put(12,6){\vector(0,-1){0}} - \put(12.5,6){\makebox(0,12)[l]{$W$}} - - \put(4,20){\vector(-1,0){4}} \put(4,20){\vector(1,0){0}} - \put(0,20.5){\makebox(4,0)[b]{$D$}} - \put(4,20){\vector(1,0){6}} \put(4,20){\vector(-1,0){0}} - \put(4,20.5){\makebox(6,0)[b]{$H$}} - \end{picture}} -\end{picture} \end{quote} - -\subsection{$B0[%G%#%l%/%7%g%s$N%\%C%/%9(B} - -$B0l$D$NJ8=q(B, $B0lKg$N%Z!<%8$G$"$C$F$bItJ,$K$h$C$FAH$_J}8~$rJQ$($i$l$k$h$&$K(B, -$BAH$_J}8~$N:.:_$r5v$9$3$H$K$7$?(B. -$B$?$H$($P(B, $BI=$NCf$G9`L\$K$h$C$F=DAH$_(B/$B2#AH$_$r;H$$J,$1$k$3$H$,2DG=$K$J$l$P(B -$BI=8=NO$,A}$9$3$H$K$J$k(B. -$B$^$?(B, $B=DAH$_Cf$G?t7e$N?t$rI=8=$9$k$H$-(B, -$B%"%i%S%"?t;z$r2#AH$_$K$7$F=DAH$_Cf$KA^F~$9$k$3$H$,$"$k(B. -$B$3$l$r=PHG6H3&$G$OO"?t;z$H8@$&$,(B, $B$3$l$bAH$_J}8~$N:.:_5!G=$Go(B, -\verb|\hbox|, \verb|\vbox|$B$,l9g$G(B$W$, $D$, $H$$B$N;;=PJ}K!$,0[$J$k$N$O(B, -$B=DAH$_(B, $B2#AH$_$G$NJ8;z$N07$$$N0c$$!J(B\ref{jfont}$B;2>H!K$rH?1G$7$F$$$k(B. - -\TeX $B$K$O(B256$B8D$N%\%C%/%9%l%8%9%?$,MQ0U$5$l$F$$$F(B -\begin{quote} - \verb|\setbox123\hbox{\yoko |\angle{$BJ8(B}\verb|}| -\end{quote} -$B$H=q$1$P(B, $B%\%C%/%9%l%8%9%?$N(B123$BHV$K(B\angle{$BJ8(B}$B$rFbMF$H$9$k(B -$B2#%G%#%l%/%7%g%s$N(Bh$B%\%C%/%9$,EPO?$5$l$k(B. -$BEPO?$5$l$?%\%C%/%9$O(B -\begin{quote} \begin{verbatim} - \advance\ht123 by \dp123 - \dp123=0 -\end{verbatim} \end{quote} -$B$N$h$&$K(B, \verb|\wd|, \verb|\dp|, \verb|\ht|$B$r;H$C$F(B -$B%\%C%/%9$NBg$-$5$d%Y!<%9%i%$%s$N0LCV$r<+M3$KJQ$($k$3$H$,$G$-$k(B. -\pTeX $B$G$O(B, $B%l%8%9%?$NFbMF$O(B -\begin{quote} \begin{verbatim} - \hbox{\tate\copy123} - \hbox{\yoko\box123} -\end{verbatim} \end{quote} -$B$N$h$&$K$I$N%G%#%l%/%7%g%s$G;HMQ$5$l$k$+$o$+$i$:(B, -$B%\%C%/%9$,;HMQ$5$l$k%G%#%l%/%7%g%s$K$h$C$F(B, $W$, $D$, $H$$B$O0[$J$kCM$r;}$D(B. -$B$=$3$G(B\verb|\wd|$B$J$I$b(B, -$B$=$N$H$-$N%G%#%l%/%7%g%sMQ$N(B$W$$B$J$I$r%"%/%;%9$9$k$3$H$K$7$?(B. -\begin{quote} - \verb|\hbox{\yoko \global\wd123=|\angle{$B=D9b$5(B}\verb|}|\\ - \verb|\hbox{\tate \global\wd123=|\angle{$B2#I}(B}\verb|}|\\ - \verb|\hbox{\tate\copy123}|\\ - \verb|\hbox{\yoko\box123}| -\end{quote} -$B$N$h$&$K=q$1$P(B, 3$B9TL\$N(B\verb|\copy123|$B$N(B$W$$B$O(B\angle{$B=D9b$5(B}$B$G$"$j(B, -4$B9TL\$N(B\verb|\box123|$B$N(B$W$$B$O(B\angle{$B2#I}(B}$B$G$"$k(B. - -$B$3$N>l9gCm0U$7$J$1$l$P$J$i$J$$$N$O(B, -\verb|\hbox|, \verb|\vbox|$B$G:n$i$l$?%\%C%/%9$O(B -$W_t=H_y+D_y$, $W_y=H_t+D_t$$B$G$"$k$,(B, -\verb|\wd|, \verb|\dp|, \verb|\ht|$B$r;H$C$F(B$W$, $D$, $H$$B$rJQ99$9$k$H(B -$B$3$N4X78$OI,$:$7$b@.N)$7$J$$$H$$$&$3$H$G$"$k(B. -$B%G%#%l%/%7%g%s$K$h$C$F%\%C%/%9$NBg$-$5$,JQ2=$9$k$3$H$K$J$k(B. - -\subsection{$B0[%G%#%l%/%7%g%s$N%"%8%c%9%H(B, $B%$%s%5!<%H(B} - -v$B%b!<%I$dFbIt(Bv$B%b!<%I$NCf$N(Bh$B%\%C%/%9$NCf$K(B\verb|\vadjust|$B$r;H$&$H(B, -v$B%j%9%H$N$=$N%\%C%/%9$Nc$J$/(B\verb|vadjust|$B$,;H$($k$h$&$K$7$?(B. -\begin{quote} - $B!J=D%G%#%l%/%7%g%s(B, v$B%b!<%I!K(B\\ - \verb|\hbox{\yoko |\ldots\verb|\vadjust{|\ldots\verb|}|\ldots\verb|}| -\end{quote} -\verb|\vadjust|$B$NCf3g8L$NFbB&$O(B, $B<+F0E*$K(B, -$B$=$l$,%"%8%c%9%H$5$l$k%j%9%H$N%G%#%l%/%7%g%s$G$"$k=D%G%#%l%/%7%g%s$K$J$k(B. - -\verb|\insert|$B$N>l9g(B, $B%/%i%9$K$h$C$F%G%#%l%/%7%g%s$rJQ$($?$$>l9g$b$"$k(B. -$B$?$H$($PJ8=qA4BN$O=DAH$_$G(B, $B5SCm$O2#AH$_$9$k$H$7$h$&(B. -$B?^$r%/%i%9(B12$B$N%$%s%5!<%H$G(B, $B5SCm$r%/%i%9(B34$B$N%$%s%5!<%H$G=hM}$9$k$3$H$K$9$k(B. -\begin{quote} - $B!J=D%G%#%l%/%7%g%s(B, v$B%b!<%I!K(B\\ - \ldots\verb|\insert12{\tate |\ldots\verb|}|\ldots\\ - \ldots\verb|\insert34{\yoko |\ldots\verb|}|\ldots\\ - \ldots\verb|\insert12{\tate |\ldots\verb|}|\ldots\\ - \ldots\verb|\insert34{\yoko |\ldots\verb|}|\ldots -\end{quote} -$B$3$N$h$&$K=q$1$P(B, -$B%\%C%/%9%l%8%9%?(B12$B$K$O=D%G%#%l%/%7%g%s$G?^$,=8$a$i$l(B, -$B%\%C%/%9%l%8%9%?(B34$B$K$O2#%G%#%l%/%7%g%s$G5SCm$,=8$a$i$l$k$h$&$K$7$?(B. -$B$J$*(B, $BF1$8%/%i%9$K0c$&%G%#%l%/%7%g%s$r:.$<$F;H$&$3$H$O$G$-$J$$(B. - - -\section{$B=DAH$_$K;HMQ$9$kJ8;z(B} \label{font} - -\subsection{$B=DAH$_MQF|K\8l%U%)%s%H(B} - -\TeX $B$O3F%U%)%s%H$K0l$D$:$DMQ0U$5$l$F$$$k(B -{\tt TFM}$B!J(B\kern0pt{\it\TeX\/} {\it F\/}ont {\it M\/}etric\kern0pt $B!K%U%!%$%k$r(B -$B;2>H$7$FAHHG$r9T$&(B. -{\tt TFM}$B%U%!%$%k$K$O$=$N%U%)%s%H$K4^$^$l$k3FJ8;z$NBg$-$5$J$I(B -$BAHHG$KI,MW$J>pJs$,Dj5A$7$F$"$k(B. - -\pTeX $B$G$bF1MM$G$"$k$,(B, $BF|K\8l$N%U%)%s%H$N>l9g(B, $BF1$8=qBN$G$b(B -$B=DAH$_$G;H$&$+2#AH$_$G;H$&$+$K$h$C$F(B, $BAHHG$KI,MW$J>pJs$OJQ$o$C$F$/$k(B. -$B$?$H$($P(B, ``$B$j(B''$B$H$$$&J8;z$OHf3SE*=D$KD9$$J8;z$G$"$k$,(B, -$B$3$N$h$&$JJ8;z$O2#AH$_$G$O$H$J$j$NJ8;z$H$N4V3V$r$D$a$FAH$`$3$H$O$G$-$F$b(B, -$B=DAH$_$G$O$"$kDxEY4V3V$r6u$1$J$$$HFI$_$K$/$/$J$C$F$7$^$&(B. -$B$=$3$G(B, $B2#AH$_;~$H=DAH$_;~$G$O(B, -$BJL$N(B\verb|TFM|$B%U%!%$%k$r;2>H$7$FAHHG$9$k$3$H$K$7$?(B. -\TeX $B$+$i8+$k$H(B, $B=DAH$_$H2#AH$_$G$OJL$N%U%)%s%H$r;H$C$F$$$k$h$&$K(B -$B8+$($k$3$H$K$J$k(B. -$B$?$@$7(B, $BAH$_J}8~$K$h$k%U%)%s%H$N@Z$jBX$($O(B, -$B%f!<%6!<$,5$$K$9$kI,MW$,$J$$$h$&$K<+F0E*$K9T$&$h$&$K$7$?(B. -$BOBJ8MQ$N%+%l%s%H%U%)%s%H$r(B2$B$DMQ0U$7(B, -$B%G%#%l%/%7%g%s$K$h$C$F<+F0E*$K@Z$jBX$($k$h$&$K$7$F$"$k(B. -$B$^$?(B{\tt TFM}$B%U%!%$%k$K=DAH$_MQ$+2#AH$_MQ$+$N>pJs$rKd$a9~$_(B, -$B%U%)%s%H$r;XDj$7$?$H$-(B, $B<+F0E*$KE,@Z$J%+%l%s%H%U%)%s%H$r@Z$jBX$($k$h$&$K$7$?(B. - -\label{jfont} -$B2#AH$_$G$O(B, $B%Y!<%9%i%$%s$OJ8;z$N2<$NJ}$rDL$C$F$$$k(B. -$B=DAH$_$NOBJ8%U%)%s%H$O(B, $B%Y!<%9%i%$%s$,J8;z$NCf1{$rDL$k$3$H$K$7$?(B. -$B9T$NESCf$GJ8;z$NBg$-$5$rJQ$($?$H$-(B, $B$=$N$[$&$,<+A3$@$HH=CG$7$?$+$i$G$"$k(B. - -\subsection{$B=DAH$_Cf$N2$J8(B} - -$B=DAH$_$NItJ,$K2$J8$d?t<0$,=P$F$/$k$H(B, -$B=>Mh$N(B\TeX $B$N2$J8MQ%U%)%s%H$r(B$90^\circ$$B2sE>$7$F>e$+$i2<$K8~$+$C$FAH$s$G$$$/(B. -$B$3$l$OIaDL$K2#$KAH$s$@2$J8$r(B, 90$BEY2sE>$5$;$?$h$&$J7k2L$K$J$k(B. -$B$H$3$m$,(B, \ref{jfont}$B$G@bL@$7$?$h$&$K(B, -$B=DAH$_$NOBJ8$N%Y!<%9%i%$%s$OJ8;z$NCf?4$rDL$k$h$&$K$7$?$N$G(B, -$B$=$3$K2$J8$N%Y!<%9%i%$%s$r0lCW$5$;$k$H9T$,$:$l$F8+$($F$7$^$&(B. -$B$=$3$G(B, \verb|\tbaselineshift|$B$H$$$&(Bdimen$BJQ?t$rMQ0U$7(B, -$B$=$N@#K!$@$1=DAH$_Cf$N2$J8$N%Y!<%9%i%$%s$r%7%U%H$5$;$k$3$H$K$7$?(B. - -$B2#AH$_$G$b(B, $BOBJ8$H2$J8$N%Y!<%9%i%$%s$N0LCV$r:Y$+$/D4@a$7$J$$$H(B, -$B%U%)%s%H$N%G%6%$%s$K$h$C$F$O%P%i%s%9$,0-$/$J$k>l9g$,$"$j(B, -\verb|\ybaselineshift|$B$rMQ0U$7$FD4@a2DG=$K$7$?(B. - -\begin{quote} \begin{picture}(0,46) - \put(4,41){\line(0,1){5}} - \put(4,40){\begin{picture}(0,0) - \thicklines - \put(-7,-14){\framebox(14,14){$B=DAH$_$N4A;z(B}} - \put(0,0){\line(0,-1){14}} - - \thinlines - \put(8,0){\line(1,0){2}} \put(8,-14){\line(1,0){2}} - \put(-7,1){\line(0,1){2}} \put(7,1){\line(0,1){2}} - - \put(9,0){\vector(0,-1){14}} \put(9,0){\vector(0,1){0}} - \put(9.5,-14){\makebox(0,14)[l]{$W$}} - \put(0,2){\vector(1,0){7}} \put(0,2){\vector(-1,0){0.0}} - \put(0,2.5){\makebox(7,0)[b]{$H$}} - \put(0,2){\vector(-1,0){7}} \put(0,2){\vector(1,0){0.0}} - \put(-7,2.5){\makebox(7,0)[b]{$D$}} - \end{picture}} - \put(4,19){\line(0,1){6}} \put(0,19){\line(0,1){5}} - \put(0,23){\vector(1,0){4}} \put(0,23){\vector(-1,0){0}} - \put(4.5,23){\makebox(0,0)[l]{\tt \char92 tbaselineshift}} - \put(0,18){\begin{picture}(0,0) - \thicklines - \put(-4,-12){\framebox(12,12){$B1Q;z!J(B$90^\circ$ $B2sE>!K(B}} - \put(0,0){\line(0,-1){12}} - - \thinlines - \put(-4,1){\line(0,1){2}} \put(8,1){\line(0,1){2}} - \put(9,0){\line(1,0){2}} \put(9,-12){\line(1,0){2}} - - \put(-4,2){\vector(1,0){4}} \put(-4,2){\vector(-1,0){0}} - \put(-4,2.5){\makebox(4,0)[b]{$D$}} - \put(0,2){\vector(1,0){8}} \put(0,2){\vector(-1,0){0}} - \put(4,2.5){\makebox(4,0)[b]{$H$}} - \put(10,0){\vector(0,-1){12}} \put(10,0){\vector(0,1){0}} - \put(10.5,0){\makebox(0,-12)[l]{$W$}} - \end{picture}} - \put(4,0){\line(0,1){5}} - - \put(16,8){\line(1,0){5}} - \put(22,8){\begin{picture}(0,0) - \thicklines - \put(0,-2){\framebox(14,14){$B2#AH$_$N4A;z(B}} - \put(0,0){\line(1,0){14}} - - \thinlines - \put(-3,-2){\line(1,0){2}} \put(-3,12){\line(1,0){2}} - \put(0,13){\line(0,1){2}} \put(14,13){\line(0,1){2}} - \put(-2,0){\vector(0,-1){2}} \put(-2,0){\vector(0,1){0}} - \put(-2.5,-2){\makebox(0,2)[r]{$D$}} - \put(-2,0){\vector(0,1){12}} \put(-2,0){\vector(0,-1){0}} - \put(-2.5,0.0){\makebox(0.0,12.0)[r]{$H$}} - \put(0,14){\vector(1,0){14}} \put(0,14){\vector(-1,0){0}} - \put(0,14.5){\makebox(14,0.0)[b]{$W$}} - \end{picture}} - \put(37,8){\line(1,0){6}} \put(38,9){\line(1,0){5}} - \put(39,9){\vector(0,-1){0}} \put(39,8){\vector(0,1){0}} - \put(39,4){\line(0,1){7}} - \put(39,3.5){\makebox(0,0)[t]{\tt \char92 ybaselineshift}} - \put(44,9){\begin{picture}(0,0) - \thicklines - \put(0,-4){\framebox(12,12){$B1Q;z!J@5N)!K(B}} - \put(0,0){\line(1,0){12}} - - \thinlines - \put(-3,-4){\line(1,0){2}} \put(-3,8){\line(1,0){2}} - \put(0,9){\line(0,1){2}} \put(12,9){\line(0,1){2}} - - \put(-2,0){\vector(0,-1){4}} \put(-2,0){\vector(0,1){0}} - \put(-2.5,-4){\makebox(0,4)[r]{$D$}} - \put(-2,0){\vector(0,1){8}} \put(-2,0){\vector(0,-1){0}} - \put(-2.5,0){\makebox(0,8)[r]{$H$}} - \put(0,10){\vector(1,0){12}} \put(0,10){\vector(-1,0){0}} - \put(0,10.5){\makebox(12,0)[b]{$W$}} - \end{picture}} - \put(57,8){\line(1,0){5}} -\end{picture} \end{quote} - - -\section{$B=DAH$_Cf$N?t<0(B} - -$B=DAH$_Cf$N?t<0$b(B, $B2$J8$HF1MM$K%7%U%H$5$;$J$1$l$P$J$i$J$$(B. -\TeX $B$N?t<0$K$O(B, $BJ,?t$N@~$N9b$5$J$I$r7hDj$9$k$?$a$N(B -axis$B!J<4!K$H$$$&35G0$,$"$k$N$G(B, $B$3$l$G%7%U%HNL$r7hDj$9$k$3$H$K$7$?(B. - -$BLdBj$Ol9g$G$"$k(B. -\begin{quote} - $B!J=D%G%#%l%/%7%g%s(B, h$B%b!<%I!K(B\\ - \ldots\verb|$ \hbox{$ |\angle{$B?t<0(B}\verb| $} $|\ldots -\end{quote} -$B$3$N>l9g(B, $B?t<0%b!<%I$,%M%9%F%#%s%0$5$l$k$3$H$K$J$k$N$G(B, -$BFbB&$N(B\angle{$B?t<0(B}$B$O(B2$B2s%7%U%H$5$l$k$3$H$K$J$C$F$7$^$&(B. -$B$3$l$rHr$1$k$?$a(B, \verb|$| $B$NFbB&$O(B, -$BIaDL$N=D%G%#%l%/%7%g%s$G$O$J$$=D?t<0%G%#%l%/%7%g%s$K0\9T$9$k$3$H$K$7$?(B. -$B=D?t<0%G%#%l%/%7%g%s$G$O(B -$BJ8;z$d%\%C%/%9$NJB$VJ}8~$O=D%G%#%l%/%7%g%s$HF1$8$G$"$k$,(B, -$B$=$NB>$NF0:n$O2#AH$_$HF1MM$G$"$k(B. -$B?t<0%G%#%l%/%7%g%sCf$G?t<0%b!<%I$K0\9T$7$F$b%7%U%H$O9T$o$:(B, -$B$^$?(B, $BF|K\8l$N%U%)%s%H$O2#AH$_%+%l%s%H%U%)%s%H$r;HMQ$9$k(B. -$B$D$^$j(B, $B?t<0$O2#AH$_$GAH$s$@$b$N$r;~7W2s$j$K(B90$BEY2sE>$7$F(B, -$B=DAH$_Cf$KA^F~$9$k7A$K$J$k(B. - -$BJX59E*$K(B, $B2#AH$_$G$b?t<0%b!<%I$KF~$k$H2#?t<0%G%#%l%/%7%g%s$KF~$k$3$H$K$7$?(B. -$B8=:_$N%G%#%l%/%7%g%s$,DL>o$N%G%#%l%/%7%g%s$G$"$k$+(B, -$B?t<0%G%#%l%/%7%g%s$G$"$k$+$O(B, \verb|\ifmdir|$B$G%F%9%H$G$-$k(B. - - -\section{$BAHHG7k2L$N=PNO(B} \label{output} - -\TeX $B$O(B\verb|\shipout|$B%W%j%_%F%$%V$G(B, $B%\%C%/%9$N:8>e6y$,;f$N:8>e6y$+$i(B, -$B1&$K(B $\verb|\hoffset|+1$B%$%s%A(B$, -$B2<$K(B $\verb|\voffset|+1$B%$%s%A(B$ $B$N0LCV$K$J$k$h$&$K(B, -{\tt DVI}$B!J(B\kern0pt{\it D\/}e{\it v\/}ice {\it I\/}ndependent\kern0pt $B!K(B -$B%U%!%$%k$K=PNO$9$k(B. -\pTeX $B$bF1MM$G$"$k(B. -\verb|\hoffset|, \verb|\voffset|$B$O(B, $B$[$+$N%W%j%_%F%#%VL>$H0c$C$F(B, -$B%G%#%l%/%7%g%s$K4X78$J$/(B, h, v$B$,K\Ev$K(Bholizontal, vertcal$B$r0UL#$7$F$$$k(B. - -$B=>Mh$N(B\verb|DVI|$BL?Na$O(B, \.$B2#(B\.$BAH(B\.$B$_(B\.$B$N(B\.$B$H(B\.$B$-%U%!%$%k$,>.$5$/$J$k$h$&$K(B -$B9)IW$5$l$F$$$k(B. -$B$?$H$($P(B, ``$BJ8;z$N0u;z(B''$B$H(B``$BJ8;zI}$@$11&$X0\F0(B''$B$,(B, -1$B$D$NL?Na$G$G$-$k$h$&$K$J$C$F$$$k(B. -\pTeX $B$G$O(B, $B=DAH$_$N>l9g$G$b2#AH$_$HF1MM$K%U%!%$%k$,>.$5$/$J$k$h$&$K(B, -\verb|DVI|$B%U%)!<%^%C%H$r3HD%$7$?(B. - -$B$?$@$7(B, $B$?$H$($P=>Mh$NJ8=q$r$3$N(B\TeX $B$G=hM}$7$?>l9g$J$I(B, -$B$=$NJ8=qFb$G=DAH$_$r;HMQ$7$F$$$J$$>l9g(B, -$B=>Mh$N$b$N$HF1$8%U%)!<%^%C%H$N(B{\tt DVI}$B$r=PNO$9$k(B. -$B$^$?(B, $B%W%j%"%s%V%k(B, $B%]%9%H%"%s%V%k$r%F%9%H$9$l$P(B, -$BJ8=qFb$7$?=DAH$_$r;HMQ$7$?2U=j$,B8:_$9$k$+$I$&$+$rCN$k$3$H$,$G$-$k$h$&$K$7$?(B. - - -\section{$B%$%s%W%j%a%s%H(B} \label{imple} - -$B8=:_9=C[Cf$N%j%9%H$N%M%9%F%#%s%0>uBV$r<($9(B -$B%l%3!<%I!J(B\kern0pt {\it list\_state\_record\/}$B!K$K(B, -$B%G%#%l%/%7%g%s$rI=$9%U%#!<%k%I$rDI2C$7(B, -$B%H%C%W$N%G%#%l%/%7%g%s$r%^%/%m(B{\it direction\/}$B$G%"%/%;%9$G$-$k$h$&$K$7$?(B. -{\it direction\/}$B$NCM$O(B{\it dir\_yoko\/}$B$+(B, {\it dir\_tate\/}$B$+(B, -$-{\it dir\_yoko\/}$$B$+(B, $-{\it dir\_tate\/}$$B$G$"$k(B. -$-{\it dir\_yoko\/}$, $-{\it dir\_tate\/}$$B$O?t<0%G%#%l%/%7%g%s$r0UL#$9$k(B. - -$B3Fl9g(B, -$B4V$K(B{\it dir\_node\/}$B$rA^F~$7$F(B, $B%\%C%/%9$NBg$-$5$J$I$r@09g$5$;$k(B. -{\it dir\_node\/}$B$O(B, {\it hlist\_node\/}, {\it vlist\_node\/}$B$H(B -$BA4$/F1$89=B$$r;}$C$F$$$k(B. -$B%j%9%H$K$O$3$N(B{\it dir\_node\/}$B$,A^F~$5$l(B, -{\it dir\_node\/}$B$N(B{\it box\_dir\/}$B$K$O%j%9%H$N%G%#%l%/%7%g%s$,(B, -{\it width\/},{\it depth\/},{\it height\/}$B$K$O(B, -$B%j%9%H$N%G%#%l%/%7%g%s$G8+$?(B, $B%\%C%/%9$N(B$W$, $D$, $H$$B$NCM$,F~$C$F$$$k(B. -{\it dir\_node\/}$B$N(B{\it list\_ptr\/}$B$O<(B'}} - \end{picture}} - \put(10,0){\begin{picture}(0,0) - \put(-4,-3){\framebox(8,4){}} - \put(0,0){\vector(1,0){6}} - \put(0,0){\circle*{0.3}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-3){\makebox(8,2)[c]{`$BOB(B'}} - \end{picture}} - \put(20,0){\begin{picture}(0,0) - \put(-4,-7){\framebox(8,8){}} - \put(-4,-1){\makebox(4,2)[c]{\bf $B=D(B}} - \put( 0,-1){\line(0,1){2}} - \put( 2, 0){\vector(1,0){4}} - \put(2,0){\circle*{0.3}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-5){\makebox(8,4)[c]{\it dir\_node\/}} - \put(-4,-5){\line(1,0){8}} - \put( 0,-6){\circle*{0.3}} - \put( 0,-6){\vector(0,-1){3}} - \end{picture}} - \put(30,0){\begin{picture}(0,0) - \put(-4,-3){\framebox(8,4){}} - \put(-4,-1){\line(4,1){8}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-3){\makebox(8,2)[c]{`$BG/(B'}} - \end{picture}} - - \put(20,-10){\begin{picture}(0,0) - \put(-4,-7){\framebox(8,8){}} - \put(-4,-1){\makebox(4,2)[c]{\bf $B2#(B}} - \put( 0,-1){\line(0,1){2}} - \put( 0,-1){\line(2,1){4}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-5){\makebox(8,4)[c]{\it hlist\_node\/}} - \put(-4,-5){\line(1,0){8}} - \put( 0,-6){\circle*{0.3}} - \put( 0,-6){\vector(0,-1){3}} - \end{picture}} - - \put(20,-20){\begin{picture}(0,0) - \put(-4,-3){\framebox(8,4){}} - \put(0,0){\vector(1,0){6}} - \put(0,0){\circle*{0.3}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-3){\makebox(8,2)[c]{`3'}} - \end{picture}} - \put(30,-20){\begin{picture}(0,0) - \put(-4,-3){\framebox(8,4){}} - \put(-4,-1){\line(4,1){8}} - \put(-4,-1){\line(1,0){8}} - \put(-4,-3){\makebox(8,2)[c]{`8'}} - \end{picture}} -\end{picture}\end{quote} -\begin{quote}\gt\begin{verbatim} - \tmin $B><(B - \tmin $BOB(B - \dirboxT(5.00002+5.00002)x6.44444 - .\hboxY(6.44444+0.0)x10.00003 - ..\tenrm 3 - ..\tenrm 8 - \penalty 500(for \jcharwidowpenalty) - \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 - \tmin $BG/(B -\end{verbatim} \end{quote} - -`\verb|\hbox{|'$B$HF~NO$5$l$k$H(B, -$B$=$l$^$G$N%j%9%H$d%b!<%I$d%G%#%l%/%7%g%s$,%;!<%V$5$l(B, -$B?7$?$J%j%9%H$d%b!<%I$d%G%#%l%/%7%g%s$,MQ0U$5$l$k(B. -\verb|\tate|$B$d(B\verb|\yoko|$B$O(B, -$B$=$N;~E@$G$N%j%9%H$,6u$G$"$l$P%G%#%l%/%7%g%s$rJQ99$9$k(B. -`\verb|\hbox{|'$B$KBP1~$9$k(B`\verb|}|'$B$,F~NO$5$l$k$H(B, -$B$^$:(B, \verb|\hbox{}|$B$NFbIt$N%G%#%l%/%7%g%s$HF1$8%G%#%l%/%7%g%s$N%\%C%/%9$,(B -$B:n$i$l$k(B. -$B$=$N%G%#%l%/%7%g%s$H(B\verb|\hbox{}|$B$N30B&$N%G%#%l%/%7%g%s$,0lCW$7$F$$$J$1$l$P(B, -{\it dir\_node}$B$r;H$C$F(B, $B%G%#%l%/%7%g%s$,@09g$5$;$i$l$k(B. - -\subsection{\it disp\_node} - -$BOBJ8Cf$N2$J8$d?t<0$N%Y!<%9%i%$%s$r%7%U%H$5$;$k$?$a$K(B, -$B?7pJs%o!<%I$N$[$+$K(B -{\it disp\_dimen\/}$B%U%#!<%k%I!J(B1$B%o!<%I!K$r;}$C$F$$$k(B. -{\it disp\_node\/}$B$O(Bh$B%j%9%HCf$K$N$_B8:_$7(B, -$B$3$N%N!<%I0J9_$N$9$Y$F$N%N!<%I$N%Y!<%9%i%$%s$r(B, -{\it disp\_dimen}$B$@$19TAw$jJ}8~$K%7%U%H$5$;$k(B. - -$B$?$H$($P(B, $B=D%G%#%l%/%7%g%s$G(B\verb|\tbaselineshift|$B$NCM$,(B2$B%]%$%s%H$N$H$-(B, -\begin{quote}\gt - \ldots\verb|$B$3$N(Bdisp$B%N!<%I(B|\ldots -\end{quote} -$B$N$h$&$KF~NO$9$k$H(B`\verb|disp|'$B$NA0$K(B2$B%]%$%s%H$N(B{\it disp\_node\/}, -$B8e$K(B0$B%]%$%s%H$N(B{\it disp\_node\/}$B$,A^F~$5$l$k(B. -\begin{quote}\gt\begin{verbatim} - \tmin $B$3(B - \tmin $B$N(B - \displace 2.0 - \glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 - \tenrm d - \tenrm i - \tenrm s - \tenrm p - \displace 0.0 - \glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 - \tmin $B%N(B - \penalty 200(for kinsoku) - \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 - \tmin $B!<(B - \penalty 500(for \jcharwidowpenalty) - \glue(\kanjiskip) 0.0 plus 0.4 minus 0.4 - \tmin $B%I(B -\end{verbatim} \end{quote} -$BJ8;z!J(B\kern0pt {\it char\_node\/}$B!K(B, -$B%\%C%/%9!J(B\kern0pt {\it hlist\_node\/}, {\it vlist\_node\/}, {\it dir\_node\/}$B!K(B, -$B7S@~!J(B\kern0pt {\it rule\_node\/}$B!K0J30$N%N!<%I$K$O(B, -$H$$B$d(B$D$$B$,$J$$$N$G(B{\it disp\_node\/}$B$N1F6A$rC$9$h$&$K$7$?(B. -\begin{quote}\gt\begin{verbatim} - .\tmin $B$3(B - .\tmin $B$N(B - .\displace 2.0 - .\glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 - .\tenrm d - .\tenrm v - .\tenrm i - .\glue 3.33333 plus 1.66666 minus 1.11111 - .\tenrm ^^L (ligature fi) - .\tenrm l - .\tenrm e - .\displace 0.0 - .\glue(\xkanjiskip) 2.5 plus 1.0 minus 1.0 - .\tmin $B%U(B - .\penalty 150(for kinsoku) - .\glue 1.07391 minus 1.07391 - .\tmin $B%)(B -\end{verbatim} \end{quote} - -\subsection{$B=DAH$_MQ(B{\tt TFM}$B%U%!%$%k(B} - -$B=DAH$_%U%)%s%HMQ3HD%(B{\tt TFM}$B%U%!%$%k$N%U%)!<%^%C%H$O(B, $B4pK\E*$K$O(B, -$B=>Mh$N(B{\tt JFM}$B%U%)!<%^%C%H(B\cite{jfm}$B$HJQ$o$i$J$$(B. -$B$?$@3F%U%#!<%k%I$N0UL#$,B?>/JQ2=$7$F$$$k(B. -$B:G=i$N%O!<%U%o!<%I!J(B\kern0pt {\it id}\kern0pt $B!K$G(B -{\tt JFM}$B%U%)!<%^%C%H$G$"$k$3$H$r<($9(B. -$\hbox{\it id} = 11$ $B$N>l9g$O2#AH$_MQ(B{\tt JFM}, -$\hbox{\it id} = 9$ $B$N>l9g$O=DAH$_MQ(B{\tt JFM}$B$G$"$k(B. - -{\it width}, {\it italic}, {\it kern}, {\it glue}$B$J$I(B -$B=>Mh$N2#AH$_(B{\tt JFM}$B%U%)!<%^%C%H$G2#J}8~$N0UL#$r;}$C$F$$$?%U%#!<%k%I$O(B, -$B=DAH$_(B{\tt JFM}$B$G$O=D!J;zAw$j!KJ}8~$N0UL#$r;}$D(B. -$B$?$H$($P(B{\it width}$B$O$=$NJ8;z$N=DJ}8~$NBg$-$5$G$"$k(B. - -{\it height}, {\it depth}$B$J$I(B -$B=>Mh$N2#AH$_(B{\tt JFM}$B$G=DJ}8~$N0UL#$r;}$C$F$$$?%U%#!<%k%I$O(B, -$B=DAH$_(B{\tt JFM}$B$G$O2#!J9TAw$j!KJ}8~$N0UL#$r;}$D(B. -{\it height}$B$O$=$NJ8;z$N%Y!<%9%i%$%s$N1&B&$NBg$-$5(B, -{\it depth}$B$O$=$NJ8;z$N%Y!<%9%i%$%s$N:8B&$NBg$-$5$G$"$k(B. - -\subsection{$B3HD%(B{\tt DVI}$B%U%)!<%^%C%H(B} - -$B=>Mh$N(B\verb|DVI|$B$K$O?eJ?J}8~$X0\F0$9$kL?Na$H$7$F(B\verb|right|, -$B?bD>J}8~$X0\F0$9$kL?Na$H$7$F(B\verb|down|$B$H$$$&L>A0$,;HMQ$5$l$F$$$k(B. -h$B%\%C%/%9$r(B``$B?eJ?%\%C%/%9(B''$B$G$O$J$/(B``$B;zAw$jJ}8~$N%\%C%/%9(B''$B$HDj5A$7$?$h$&$K(B -\verb|right|$BL?Na$r;zAw$jJ}8~$X0\F0$9$kL?Na(B, -\verb|down|$BL?Na$r9TAw$jJ}8~$X0\F0$9$kL?Na$HDj5A$7$?(B. -$B;zAw$j(B, $B9TAw$j$NJ}8~$O(B, $BAH$_J}8~$K$h$C$FJQ$o$k$N$G(B, -\verb|DVI|$B%j!<%@$K$b%G%#%l%/%7%g%s$r@_$1$F(B, -$B?7$7$$L?Na(B\verb|dir|$B$K$h$C$F%G%#%l%/%7%g%s$r@Z$j49$($k$3$H$K$7$?(B. -\verb|push|, \verb|pop|$B$G(B, $(h,v,w,x,y,z)$$B$NB>$K(B, -$B%G%#%l%/%7%g%s(B$d$$B$b(Bpush, pop$B$9$k(B. - -\verb|DVI|$B$NL?Na$O:G=i$N(B1$B%P%$%H$G<1JL$G$-$k$h$&$K$J$C$F$$$k(B. -$B$9$G$K(B0--249$B$,;HMQ$5$l$F$$$k(B\footnote{ - \TeX $B$r(B, $B1Q8l$J$I$N:8$+$i1&$X=q$/8@8l$H(B, - $B%"%i%S%"8l$d%X%V%i%$8l$N$h$&$K1&$+$i:8$X=q$/8@8l$r(B - $B:.?"$G$-$k$h$&$K2~B$$7$?;vNc(B\cite{arabic}$B$G$O(B, - $B$=$N%$%s%W%j%a%s%H$NJ}K!$H$7$F(B\verb|DVI|$BL?Na$r3HD%$7$F$*$j(B, - 250, 251$B$r;HMQ$7$F$$$k(B. -}$B$N$G?7$7$$L?Na$O(B255$B$r;H$&$3$H$K$7$?(B. -\verb|dir|$B!J(B\kern0pt 255\kern0pt $B!KL?Na$O(B1$B%P%$%H$N0z?t(B$d$$B$r(B1$B$Dl9g$O=>Mh$N(B\verb|DVI|$B$H%3%s%Q%A%V%k$G$"$k$,(B, -$B=D%G%#%l%/%7%g%s$N>l9g$O=>Mh$N(B\verb|DVI|$B$G2#J}8~$K0\F0$9$kL?Na(B -\begin{quote} \begin{verbatim} - set_char_* set? set_rule right? w? x? -\end{verbatim} \end{quote} -$B$O=DJ}8~!J;zAw$jJ}8~!K$K0\F0$9$kL?Na$H$J$j(B, -$B=>Mh$N(B\verb|DVI|$B$G=DJ}8~$K0\F0$9$kL?Na(B -\begin{quote} \begin{verbatim} - down? y? z? -\end{verbatim} \end{quote} -$B$O2#J}8~!J9TAw$jJ}8~!K$K0\F0$9$kL?Na$H$J$k(B. - -$BJ8;z$O(B, $B%Y!<%9%i%$%s$NJ}8~$,;zAw$j$NJ}8~$H0lCW$9$k$h$&$K(B, -$BI,MW$J$i2sE>$7$F(B, $B0u;z$5$l$J$1$l$P$J$i$J$$(B. -$B7S@~$NL?Na$b%G%#%l%/%7%g%s$K$h$C$FJ}8~$,JQ$o$k(B. -$B=>Mh$N(B\verb|set_rule|, \verb|put_rule|$B$G$O(B, -$B:G=i$N0z?t$,9b$5(B, $BHE@$r0\F0$5$;$k(B. - -$B3F%Z!<%8$N@hF,$G$O(B, {\tt DVI}$B%j!<%@$O2#%G%#%l%/%7%g%s$G$"$j(B, -$B3HD%(B\verb|DVI|$BBP1~$N%W%j%s%?%I%i%$%P$G(B, $B=>Mh$N(B\verb|DVI|$B$b%W%j%s%H%"%&%H$G$-(B, -$B3HD%L?Na!J(B\kern0pt \verb|dir|\kern0pt $B!K$r;H$C$F$$$J$$(B\verb|DVI|$B%U%!%$%k$O(B, -$B=>Mh$N%W%j%s%?%I%i%$%P$G%W%j%s%H%"%&%H$G$-$k(B. - -\verb|DVI|$B%U%!%$%k$K$O(B, $B%U%!%$%k$N@hF,!J(B\kern0pt preamble\kern0pt $B!K$H(B -$BKvHx!J(B\kern0pt postamble\kern0pt $B!K$K(B\verb|DVI|$B$N%P!<%8%g%s$rI=$9(B -{\it id\_byte}$B$,=q$-9~$^$l$F$$$k(B. -$B=>Mh$N(B\verb|DVI|$B$G$O$I$A$i$N(B{\it id\_byte}$B$b(B2$B$G$"$k(B. -$B3HD%L?Na$r;H$C$F$$$k(B\verb|DVI|$B%U%!%$%k$G$O(B, postamble$B$N(B{\it id\_byte}$B$r(B3$B$K$7$F(B, -$B3HD%%W%j%s%?%I%i%$%P$G%W%j%s%H%"%&%H$7$J$1$l$P$J$i$J$$$3$H$rI=$9(B. - - -\section{$BF|K\8l(B\TeX $B$H$N8_49@-(B} - -\pTeX $B$O(B, $B5!G=LL$G$O=>Mh$NF|K\8l(B\TeX $B$H$N40A4$J8_49@-$rJ]$C$F$$$k(B. - -$B@-G=LL$G$N0c$$$rHf3S$9$k$?$a$K(B -SONY NEWS 1460$B>e$NF|K\8l(B\TeX $B$H(B\pTeX $B$GK\O@J8$rAHHG$7(B, -csh$B$N(Btime$B%3%^%s%I$G(BCPU$B;~4V$rHf3S$7$F$_$?(B. -$B$J$*$3$N%F%9%H$G$O(B, $B$"$i$+$8$a(Baux$B%U%!%$%k$r:n@.$7$F$*$-(B, -{\tt virtex}$B$K(B\LaTeX $B$N%U%)!<%^%C%H%U%!%$%k$rFI$_9~$^$;$k7A$G5/F0$7$F7WB,$7$?(B. -\begin{itemize} -\item $BF|K\8l(B\TeX $B$N>l9g(B:\\ - \verb|24.7u 0.3s 0:25 99% 44+123k 0+16io 0pf+0w| - -\item \pTeX $B$N>l9g(B:\\ - \verb|25.0u 0.3s 0:25 99% 46+121k 0+16io 0pf+0w| -\end{itemize} - -$B$d$O$jB?>/Ii2Y$O=E$/$J$C$F$$$k$h$&$@$,(B, -$BLs(B1 \%$B$J$N$G$[$H$s$IJQ$C$F$$$J$$$H8@$C$F$$$$$H;W$&(B. -$B$3$l$O(B, \pTeX $B$rF|K\8l(B\TeX $B$NCV$-49$($H$7$F;HMQ$7$F$b(B -$B;Y>c$O$J$$$H$$$&$3$H$r0UL#$7$F$$$k(B. - - -\section{$B$*$o$j$K(B} - -$B:#2s9T$C$?(B\TeX $B$N2~B$$O(B, $BAjEvBg5,LN$J$b$N$G$"$k(B. -$B%"%9%-!o$K6/NO$G(B, -$BAHHG$N=tLdBj$r$[$\2r7h$9$k$3$H$,$G$-$k(B. -$B$3$N4pK\$rF'$_30$5$J$1$l$P(B, \TeX $B$H8F$s$G$$$$$N$G$O$J$$$@$m$&$+(B. - -$B$b$H$b$H(B, \TeX $B%7%9%F%`$O%/%L!<%965e$N%/%*%j%F%#$rF@$k$3$H$rL\I8$K:n$i$l$?%7%9%F%`$G$"$k(B. -\pTeX $B$b(B, $B=>Mh$NF|K\8l$NAHHG$K$D$$$F==J,D4::$7(B, -$B@h?M$N9T$C$F$-$?H~$7$$AHHG$N$?$a$N9)IW$r(B, -$B$G$-$k8B$jl9g$O(B, - \TeX $BK\BN$N%9%Z!<%7%s%0%"%k%4%j%:%`$KJQ99$r(B - $B2C$($J$1$l$P$J$i$J$$$+$b$7$l$J$$(B. - -\item[$B4A;z!&%+%JJL%U%)%s%H(B]\ \\ - $BO$rAH$`(B. - $B%+%J$N=qBN$rJQ$($?$@$1$G$b$+$J$jJ70O5$$,JQ$o$k$b$N$G$"$k(B. - - $B$3$l$r(B\TeX $B$Gl9g$,$"$k$N$G(B, - $B%i%$%s%V%l!<%/=hM}$K;?.(B $BE}3mItD9(B, -$BF1(B $B5;=QE}3mIt(B $B;01:2m9'(B $BE}3mItD9(B, -$B$J$i$S$K(B, \TeX $B%7%9%F%`$K$D$$$F5.=E$J$40U8+$r$$$?$@$$$?(B $BF1(B $B5;=QIt(B $BBgLn=S<#(B $B})$B!'(B + $B3t<02q$K$br7o$,B7$C$F$$$J$/$F$O$J$i$J$$!#(B + +\begin{itemize} +\item \cs{autoxspcode}$B$N>uBV(B +\item \cs{xspcode}$B$*$h$S(B\cs{inhibitxspcode}$B$K$h$kM^@)$rA0!"D>8e(B +\item $B9g;z!"%Z%J%k%F%#!"%Y!<%9%i%$%sD4@0NL!"0EL[$N(B\cs{kern}$B$ND>A0!"D>8e(B +\end{itemize} + +$BK\J8$G$OB?$/$N>l9g!"C1=c$KJ8;z$,JB$s$G$$$k$@$1$J$N$G!"$3$N$h$&$J>r7o$r(B +$BCN$i$J$/$F$b!"4|BT$7$F$$$k7k2L$rF@$k$3$H$,$G$-$k!#(B +$B$7$+$7!"?t<0$rAH$_N)$F$?>l9g!"<+J,$G$O$H$/$K;XDj$r$7$F$$$J$/$F$b!"(B +\TeX{}$B$,FbIt=hM}$G!"J8;z$N0LCV$rD4@0$7$?$j!"(B\cs{vbox}$B$KF~$l$?$j$9$k$?$a$K!"(B +$B;MJ,%"%-$,F~$i$:!"$=$N860x$b$o$+$i$J$$$H$$$&$3$H$,$"$k!#(B + +$B$=$3$G!"(Bp\TeX~2.1.5$B$G$O!"%F%-%9%H?t<0$NA08e$X$N;MJ,%"%-$NA^F~J}K!$rJQ99$7$?!#(B +$B$3$NJ8=q$G$O!"$=$N3HD%$K:]$7$F$N;EMM$NJQ99$K$D$$$F4JC1$K@bL@$r$7$F$$$k!#(B + +\section{p\TeX~2.1.4$B$^$G$N?t<0$NA08e(B} +p\TeX~2.1.4$B$G(B\footnote{$B$h$j@53N$K8@$($P!"(Bp\TeX~2.1.5 $\beta$~6$B$^$G(B}$B!"(B +$B%F%-%9%H?t<0$NA0$d8e$K;MJ,%"%-$,F~$i$J$$l9g(B +\item $B%7%U%H$5$l$?(B\cs{hbox}$B$H$J$k>l9g(B +\item \cs{vbox}$B$H$J$k>l9g(B +\end{itemize} + +\subsection{\cs{xspcode}$B$K$h$k1F6A$N>l9g(B} +\cs{xspcode}$B$*$h$S(B\cs{inhibitxspcode}$B$K$h$kM^@)$O!"$?$H$($P!"(B +$\alpha$$B$d(B$\beta$$B$NA08e$K%9%Z!<%9$,F~$i$J$$$H$$$&7k2L$r$b$?$i$9!#(B +$B$J$<$J$i$P!"(B$\alpha$$B$O(Bcmmi10$B$N(B\hex{0B}$B$N0LCV!"(B$\beta$$B$O(B\hex{0C}$B$N0LCV$K(B +$B$"$k$+$i$G$"$k!#$3$l$iJ8;z$N(B\cs{xspcode}$B$NCM$O%<%m!"$9$J$o$AA08e$X$N(B +$B;MJ,%"%-$rM^@)$9$k$H$$$&F0:n$r$9$k!#(B +$B$=$N7k2L!"A08e$K;MJ,%"%-$,F~$i$J$$$N$G$"$k!#(B + +\subsection{$B%7%U%H$5$l$?(B\cs{hbox}$B$H$J$k>l9g(B} +shift\_amount$B$,%<%m$G$J$$(B\cs{hbox}$B$NNc$H$7$F$O!"(B +$\sum$$B$d(B$\int$$B$d(B$x^2$$B$d(B$x_2$$B$d(B$\sqrt{\hbox{Var(X)}}$$B$J$I$r5s$2$i$l$k!#(B + +$\sum$$B$O(Bcmex10$B$N(B\hex{50}$B$N0LCV$K$"$j!"$3$l$O(Bcmr10$B$N(B``P''$B$HF1$80LCV(B +$B$J$N$G(B\cs{xspcode}$B$K$h$kM^@)$O]30$N(B\cs{hbox}$B$H$J$C$F$7$^$$!"(B +$BA08e$X$N;MJ,%"%-$,F~$i$J$/$J$k!#(B$\int$$B$bF1MM$G$"$k!#(B + +$x^2$$B$d(B$x_2$$B$J$I$N>l9g$O!">eIU$-(B/$B2l9g$O!"A4BN$,%7%U%H$5$l$?(B\cs{hbox}$B$H$7$FAH$_N)$F$i$l$k$N$G!"(B +$BA08e$K;MJ,%"%-$,F~$i$J$$!#(B + +\subsection{\cs{vbox}$B$H$J$k>l9g(B} +$B$=$NB>$K;MJ,%"%-$,F~$k2U=j$O!"(B +$B9g;z!"%Z%J%k%F%#!"%Y!<%9%i%$%sD4@0NL!"0EL[$N(B\cs{kern}$B$ND>A0$+D>8e(B +$B$@$1$G$"$k!#$3$l0J30$N2U=j$K$OF~$i$J$$!#(B +$B?t<0$NA08e$K8B$l$P!"$3$N$&$A$N!"(B\cs{vbox}$B$NA08e$K$OF~$i$J$$$H$$$&(B +$B@)8B$,Bg$-$/1F6A$r$7$F$$$k!#$?$H$($P!"(B$\frac{1}{k}$$B$H$$$C$?J,?t$d!"(B +$x_k^2$$B$N$h$&$K>eIU$-$H2J}$r;XDj$7$?$H$-$,!"$3$l$KEv$?$k!#(B + +$BJ,?t$N>l9g$O!":G=*E*$K(B\cs{vbox}$B$H$7$FAH$_N)$F$i$l$k!#(B +$B$=$N$?$a!"J,?t$NA08e$K;MJ,%"%-$,F~$i$J$/$J$k!#(B +$B>eIU$-$H2J}$,$"$k>l9g$O!"$=$l$i$,(B\cs{vbox}$B$KF~$l$i$l$k$?$a!"(B +$BF~$i$J$/$J$k$N$G$"$k!#>eIU$-$H2l9g$H>u67$O0[$J$k$,!"(B +$B7k2L$O0l=o$G$"$k!#(B + +\section{p\TeX~2.1.5 $\beta7$$B$G$N?t<0$NA08e(B} +$B:#$^$G$Nl9g!"%F%-%9%H$N:G8e$NJ8;z$H$N4X78$G(B +$BE,@Z$J%9%Z!<%9$rF~$l$k!#$3$3$G!"=>Mh$NF0:n$H0[$J$k$N$O!"?t<0FbIt$NJ8;z$N(B +\cs{xspcode}$B$"$k$$$O(B\cs{inhibitxspcode}$B$N@_Dj$rL5;k$9$k$h$&$K$7$?E@$G$"$k!#(B +$B$D$^$j!"?t<0Fb$NJ8;z$H$=$ND>A0$H$NJ8;z$,OBJ8$+2$J8$+$@$1$rD4$Y$F!"(B +$B;MJ,%"%-$+4A;z4V%9%Z!<%9$rA^F~$9$k$h$&$K$7$?!#(B +$B$3$NJQ99$G(B$\alpha$$B$d(B$\beta$$B$J$I$NJ8;z$NA0$K%9%Z!<%9$,F~$k$h$&$K$J$k!#(B + +$B?t<0$N3+;O%N!<%I$Nl9g$O!"$=$l$,2?$G$"$C$F$b(B +$B;MJ,%"%-$rF~$l$k!#$3$N=$@5$K$h$C$F!"?t<0$,%7%U%H$5$l$?(B\cs{hbox}$B$d(B +\cs{vbox}$B$N>l9g$G$"$C$F$b;MJ,%"%-$,F~$k!#(B +$B$3$N$h$&$J%\%C%/%9$K$J$k$H$-$O!">eIU$-(B/$B2l9g$J$I$G$"$k!#(B + +$B=*N;%N!<%I$N;~E@$G$O!"$3$N8e$KA^F~$9$k%9%Z!<%9$,7h$^$C$F$$$l$P$=$l$rMQ$$$k!#(B +$B$9$J$o$A!"?t<0$N:G8e$H$=$N8e$k$NJ8;z$,$H$b$KOBJ8$G$"$l$P4A;z4V%9%Z!<%9$r(B +$BA^F~$7!"$$$:$l$+$,2$J8$G$"$l$P;MJ,%"%-$rA^F~$9$k!#(B +$B$3$N$H$-$b!"?t<0FbIt$N:G8e$NJ8;z$N(B\cs{xspcode}$B$bL5;k$9$k$h$&$K$7!"(B +$\alpha$$B$d(B$\beta$$B$J$I$N8e$m$K$bF~$k$h$&$K$7$F$$$k!#(B + +$B%7%U%H$5$l$?(B\cs{hbox}$B$d(B\cs{vbox}$B$J$I$G=*N;$7$?$H$-$O!"(B +$BA0B&$K;MJ,%"%-$rF~$l$?$N$G!"9g$o$;$k0UL#$G8eB&$K$b;MJ,%"%-$rA^F~$9$k!#(B +$B$3$l$G(B$x^2$$B$d(B$\frac{dx}{dy}$$B$d(B$\sqrt{3}$$B$J$I$N8e$m$K$b%9%Z!<%9$,F~$k!#(B + +$B$J$*!"?t<0$ND>A0$NJ8;z$H?t<0FbIt$N@hF,J8;z$,$H$b$K2$J8$N>l9g!"(B +$B$"$k$$$O?t<0FbIt$N:G8e$H?t<0D>8e$,$H$b$K2$J8$N>l9g$O!"(B +\TeX{}$B$HF1$8$G$"$jFCJL$J%9%Z!<%9$rF~$l$J$$$N$O=>Mh$HF1$8$G$"$k!#(B + +\section{p\TeX~2.1.5 $\beta8$$B$G$N?t<0$NA08e(B} +p\TeX~2.1.5 $\beta8$$B$G$O!"C1=c$K%F%-%9%H?t<0$NA08e$K;MJ,%"%-$rF~$l$kJ}K!(B +$B$G$l$G=hM}$7$?>l9g!"(B +\begin{quote} +\kanjiskip=4pt \xkanjiskip=8pt +$B""""(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B""""(B + \quad($\beta7$\kern.25zw $BHG(B)\\ +$B""""(B\kern\xkanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B""""(B + \quad($\beta8$\kern.25zw $BHG(B)\\ +$B""""(B$$BI=LL@Q(B=4\pi r^2$$B""""(B + \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} +\end{quote} +$B$H$J$k!#$D$^$j!"(B$\beta7$$BHG$G$O?t<0FbIt$NJ8;z$HD>A0$NJ8;z$rHf3S$7$F$$$k$?$a!"(B +$BA0B&$K4A;z4V%9%Z!<%9$,F~$j!"8eB&$K;MJ,%"%-$,F~$k!#(B +$B0lJ}!"(B$\beta8$$BHG$G$O?t<0FbIt$NJ8;z$K4X78$J$/!"N>B&$K;MJ,%"%-$,F~$k!#(B + +$B$J$*!"N>B&$K;MJ,%"%-$,F~$k!#(B +\begin{quote} +\kanjiskip=4pt \xkanjiskip=8pt +$B""""(B\kern\xkanjiskip$\hbox{$BI=LL@Q(B}$\kern0pt $B""""(B + \quad ($\beta7$\kern.25zw $BHG(B)\\ +$B""""(B\kern\kanjiskip$\hbox{$BI=LL@Q(B}$\kern\kanjiskip $B""""(B + \quad\hbox{\kanjiskip=0pt($\beta7$\kern.25zw $BHG$r=$@5$7$?>l9g(B)}\\ +$B""""(B\kern\xkanjiskip$\hbox{$BI=LL@Q(B}$\kern\xkanjiskip $B""""(B + \quad ($\beta8$\kern.25zw $BHG(B)\\ +$B""""(B$\hbox{$BI=LL@Q(B}$$B""""(B + \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} +\end{quote} + +$B.$5$$$N$G!"0c$$$O$=$l$[$IL\N)$?$J$$$+$b$7$l$J$$!#(B +$B$7$+$7!"=DAH$K$7$?>l9g$O!"$D$.$N$h$&$J7k2L$H$J$k!#(B +\begin{quote} +\begin{minipage}{16zw} +$B"$"$(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip\raisebox{-.25zw}{$B"$"$(B} + \quad($\beta7$\kern.25zw $BHG(B)\\ +\\ +$B"$"$(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B"$"$(B\\ + \hfill($\beta7$\kern.25zw $BHG$r=$@5$7$?>l9g(B)\\ +\\ +$B"$"$(B\kern\xkanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B"$"$(B + \quad($\beta8$\kern.25zw $BHG(B)\\ +\\ +$B"$"$(B$$BI=LL@Q(B=4\pi r^2$$B"$"$(B + \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} +\end{minipage} +\end{quote} +$\beta7$$B$N7k2L$r8+$k$HJ8;z4V$N%9%Z!<%9$O;EMM$I$*$j$K$J$C$F$$$k!#(B +$B$7$+$7!"%Y!<%9%i%$%s$ND4@0NL$,?t<0$N8e$m$GLa$C$F$$$J$$$H$$$&%P%0$,$"$k!#(B +$B$?$H$(%P%0$r=$@5$7$?$H$7$F$b!"7h$7$FFI$_$d$9$$$H$O;W$($J$$!#(B + +$B0J>e$N7k2L$rHf3S$9$k$H!"(B$\beta8$$B$NA^F~J}K!$N$[$&$,<+A3$G!"FI$_$d$9$$$h$&$K(B +$B;W$($k!#$^$?!"A^F~$5$l$k%9%Z!<%9$bA08e$NJ8;z!"?t<0Fb$NJ8;z$K4X78$J$/!"(B +$B;MJ,%"%-$H7h$^$C$F$$$k$N$G7k2L$,$o$+$j$d$9$$!#(B +$B$=$3$G!"(B$\beta8$$B$G$O!"$3$N@a$NKAF,$G=R$Y$?!"(B +\begin{center} +$BC1=c$K!"%F%-%9%H?t<0$NA08e$K;MJ,%"%-$rF~$l$k(B +\end{center} +$B$H$$$&;EMM$Go$NJ8>OFb$G$N%\%C%/%9$KBP$9$kF0:n$bJQ$o$C$F$7$^$C$F$$$?!#$?$H$($P!"(B +\begin{quote} +\begin{verbatim} +$B""""(B\AA $B"$"$"$"$(B\hbox to0pt{ABC\hss}$B!{!{!{!{(B\hbox{}A\hbox{}$B""""""""(B +\end{verbatim} +\end{quote} +$B$,(B +\begin{quote} +\setbox0=\hbox{h}\dimenA=\ht0 \advance\dimenA-1ex +$B""""(B +\leavevmode\rlap{\raise.67\dimenA\hbox{\char'27}}\kern\xkanjiskip A% +\kern\xkanjiskip $B"$"$"$"$(B +\setbox0\hbox{ABC}\dimenA=\wd0\advance\dimenA-\xkanjiskip +\kern\xkanjiskip ABC\kern-\dimenA $B!{!{!{!{(B +\kern\xkanjiskip A\kern\xkanjiskip $B""""""""(B +\end{quote} +$B$H$J$k!#@h$[$I$N%j%9%H$r=hM}$7$F4|BT$9$k7k2L$O!"HE@$N0LCV$,La$i$J$$$7!"=hM}$NM^@)$b$5$l$J$/$J$C$F$$$?(B +\footnote{$B$3$l$i$NLdBj$O(B$\beta11$$B$G=$@5!#(B}$B!#(B + +\appendix +\section{$B<+F0A^F~$5$l$k%9%Z!<%9$Nl9g$K$h$C$F(B$\pm0.4$$B%]%$%s%HJ,$@$1?-=L!"(B +\cs{xkanjiskip}$B$OI8=`$G$=$N;~E@$NOBJ8%U%)%s%H$NI}$N(B$1/4$$B!"(B +$B>l9g$K$h$C$F(B$\pm1$$B%]%$%s%HJ,$@$1?-=L$7$F$bNI$$$H$$$&$3$H$r0UL#$7$F$$$k!#(B + +\cs{kanjiskip}$B$b(B\cs{xkanjiskip}$B$b!"CJMn$N=*$o$j$+!"(B\cs{hbox}$B$N:G8e$N;~E@(B +$B$NCM$,M-8z$H$J$k!#$7$?$,$C$F!"$R$H$D$NCJMnFb$d(B\cs{hbox}$BFb$GJ#?t2s;XDj$r(B +$B$7$F$b!"$=$N:G8e$N;XDj$K$h$C$F=hM}$5$l$k!#(B + +$B$?$@$7!V!"!W$d!V!J!W$N$h$&$K!"FCDj$NJ8;z$,O"B3$9$k>l9g!"$=$N$^$^A43QI}(B +$B$GJB$Y!"4V$K(B\cs{kanjiskip}$B$rA^F~$9$k$HJ8;z$N4V$,N%$l$9$.$F$7$^$&!#(B +$B$3$N$H$-$K$O!"(B\cs{kanjiskip}$B$G$O$J$/!"(BJFM(Japanese Font Metric)$B$G@_Dj(B +$B$5$l$F$$$k%9%Z!<%9$NNL$,;H$o$l$k!#(B + +\cs{xkanjiskip}$B$K4X$7$F$b!"OBJ8$H!V(B;$B!W!"!V(B($B!W$HOBJ8!"2$J8$H!V!#!W!"(B +$B!V!D!W$HA08e$N2$J8$N$h$&$J2U=j$K$O!"%9%Z!<%9$rA^F~$7$J$$$[$&$,$-$l$$$K(B +$B8+$($k!#$=$3$G!"FCDj$N2$J8$NJ8;z$KBP$7$F!"(B\cs{xkanjiskip}$B$NA^F~$r@)8f(B +$B$9$k$?$a$K(B\cs{xspcode}$B$,MQ0U$5$l$F$$$k!#(B +$BFCDj$NOBJ8$KBP$7$F$O(B\cs{inhibitxspcode}$B$rMQ$$$F@)8f$9$k!#(B + + +\section{$B%9%Z!<%9$K4X$9$k%W%j%_%F%#%V(B} +p\TeX{}$B$G3HD%$7$?!"%9%Z!<%9$K4X$9$k%W%j%_%F%#%V$O0J2<$N$H$*$j!#(B + +\subsection{\cs{kanjiskip}, \cs{autospacing}, \cs{noautospacing}} +\cs{kanjiskip}$B$O!"(B +$B4A;z$H4A;z$N4V$K<+F0E*$KA^F~$9$k%9%Z!<%9$NNL$r3JG<$9$kD9$5%l%8%9%?$G$"$k!#(B + +\cs{autospacing}$B$H(B\cs{noautospacing}$B$O!"(B +$B4A;z$H4A;z$N4V$K%9%Z!<%9$rA^F~$9$k$+$I$&$+$r;XDj$9$k$N$KMQ$$$k!#(B +\cs{autospacing}$B$r;XDj$9$k$H<+F0E*$KA^F~$5$l$k!#(B +\cs{noautospacing}$B$r;XDj$9$k$H4A;z4V$X$N%9%Z!<%9A^F~$OM^@)$5$l$k!#(B + +\subsection{\cs{xkanjiskip}, \cs{autoxspacing}, \cs{noautoxspacing}} +\cs{xkanjiskip}$B$O!"(B +$B4A;z$H1Q;z$N4V$K<+F0E*$KA^F~$9$k%9%Z!<%9$NNL$r3JG<$9$kD9$5%l%8%9%?$G$"$k!#(B + +\cs{autoxspacing}$B$H(B\cs{noautoxspacing}$B$O!"(B +$B4A;z$H1Q;z$N4V$K%9%Z!<%9$rA^F~$9$k$+$I$&$+$r;XDj$9$k$N$KMQ$$$k!#(B +\cs{autoxspacing}$B$r;XDj$9$k$H<+F0E*$KA^F~$5$l$k!#(B +\cs{noautoxspacing}$B$r;XDj$9$k$H4A;z4V$X$N%9%Z!<%9A^F~$OM^@)$5$l$k!#(B + +\subsection{\cs{xspcode}} +\cs{xspcode}$B$O!";XDj$7$?1Q;z$H4A;z$H$N4V$N%9%Z!<%9A^F~$r(B +$B$I$N$h$&$K(B\textgt{$B5v2D(B}$B$9$k$+$N@_Dj$r$9$k%W%j%_%F%#%V$G$"$k!#(B +$BF0:n$O!"$D$.$N$$$:$l$+$N?tCM$G;XDj$r$9$k!#(B + +\begin{center} +\begin{tabular}{ll} +0 & $BA08e$N4A;z$H$N4V$X$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ +1 & $BD>A0$N4A;z$H$N4V$K$@$1%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ +2 & $BD>8e$N4A;z$H$N4V$K$@$1%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ +3 & $BA08e$N4A;z$H$N4V$K%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ +\end{tabular} +\end{center} + +$B=i4|CM$O!"(B\texttt{[0-9A-Za-z]}$B$O#3!"$=$l0J30$O%<%m$K$J$C$F$$$k!#(B +$B$?$@$7!"0J2<$NJ8;z$K$D$$$F$O!"(Bkinsoku.tex$B$GJL$NCM$K=i4|2=$5$l$F$$$k!#(B +$B3g8LFb$O(BASCII$BJ8;z%3!<%I!J(B16$B?J?t!K$G$"$k!#(B + +\begin{center} +\begin{tabular}{l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l} +\texttt{(}=1 (\hex{28}) & \texttt{)}=2 (\hex{29}) & +\texttt{[}=1 (\hex{5B}) & \texttt{]}=2 (\hex{5D})\\ +\texttt{`}=1 (\hex{60}) & \texttt{'}=2 (\hex{27}) & +\texttt{;}=2 (\hex{3B}) & \texttt{,}=2 (\hex{2C})\\ +\texttt{.}=2 (\hex{2E}) \\ +\end{tabular} +\end{center} + +$B$?$@$7!"(B\cs{xspcode}$B$N@_Dj$O!"J8;z%3!<%I$KBP$7$F$G$"$j!"%U%)%s%H$K$h$C$F(B +$B0[$J$kCM$r;XDj$9$k$3$H$O$G$-$J$$!#$7$?$,$C$F(B\hex{60}$B$N0LCV$K$"$kJ8;z$O!"(B +cmr10$B$G$O(B``\textrm{`}'', cmmi10$B$G$O(B``$\ell$'', cmex10$B$G$O(B``$\coprod$''$B$G(B +$B$"$k$,!"$3$l$i$NJ8;z$O$9$Y$F(B\cs{xspcode}=1$B$H$7$F=hM}$5$l$k!#(B + +\subsection{\cs{inhibitxspcode}} +\cs{inhibitxspcode}$B$O!";XDj$7$?4A;z$H1Q;z$N4V$N%9%Z!<%9A^F~$r(B +$B$I$N$h$&$K(B\textgt{$BM^@)(B}$B$9$k$+$N@_Dj$r$9$k%W%j%_%F%#%V$G$"$k!#(B +$BF0:n$O!"$D$.$N$$$:$l$+$N?tCM$G;XDj$r$9$k!#(B + +\begin{center} +\begin{tabular}{ll} +0 & $B4A;z$H1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ +1 & $BD>A0$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ +2 & $BD>8e$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ +3 & $BA08e$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ +\end{tabular} +\end{center} + +$B=i4|CM$O!"$9$Y$F$N4A;z$K$D$$$F#3$G$"$k!#(B +$B$?$@$7!"0J2<$NJ8;z$K$D$$$F$O!"(Bkinsoku.tex$B$GJL$NCM$K=i4|2=$5$l$F$$$k!#(B + +\begin{center} +\begin{tabular}{l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l@{\hspace{2.5zw}} + l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l} +$B!"(B=1 & $B!#(B=1 & $B!$(B=1 & $B!%(B=1 & $B!((B=1 & $B!)(B=1\\ +$B!J(B=2 & $B!K(B=1 & $B!N(B=2 & $B!O(B=1 & $B!P(B=2 & $B!Q(B=1\\ +$B!F(B=2 & $B!G(B=1 & $B!H(B=2 & $B!I(B=1 & $B!L(B=2 & $B!M(B=1\\ +$B!c(B=2 & $B!d(B=1 & $B!T(B=2 & $B!U(B=1 & $B!V(B=2 & $B!W(B=1\\ +$B!X(B=2 & $B!Y(B=1 & $B!Z(B=2 & $B![(B=1 & $B!](B=0 & $B!A(B=0\\ +$B!D(B=0 & $B!o(B=0 & $B!k(B=0 & $B!l(B=1 & $B!m(B=1\\ +\end{tabular} +\end{center} + +\end{document} Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexskip.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexskip.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexskip.tex texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexskip.tex --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/ptexskip.tex 2016-11-25 18:30:46.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/ptexskip.tex 1970-01-01 00:00:00.000000000 +0000 @@ -1,387 +0,0 @@ -\documentclass{jarticle} -\ProvidesFile{ptexskip.tex}[1997/08/08 v0.4 about pTeX skips] -\usepackage{plext} - -\title{p\TeX~2.1.5$B$K$*$1$k?t<0$NA08e(B} -\author{$BCfLn(B $B8-(B\footnote{Ken Nakano (\texttt{})$B!'(B - $B3t<02q$K$br7o$,B7$C$F$$$J$/$F$O$J$i$J$$!#(B - -\begin{itemize} -\item \cs{autoxspcode}$B$N>uBV(B -\item \cs{xspcode}$B$*$h$S(B\cs{inhibitxspcode}$B$K$h$kM^@)$rA0!"D>8e(B -\item $B9g;z!"%Z%J%k%F%#!"%Y!<%9%i%$%sD4@0NL!"0EL[$N(B\cs{kern}$B$ND>A0!"D>8e(B -\end{itemize} - -$BK\J8$G$OB?$/$N>l9g!"C1=c$KJ8;z$,JB$s$G$$$k$@$1$J$N$G!"$3$N$h$&$J>r7o$r(B -$BCN$i$J$/$F$b!"4|BT$7$F$$$k7k2L$rF@$k$3$H$,$G$-$k!#(B -$B$7$+$7!"?t<0$rAH$_N)$F$?>l9g!"<+J,$G$O$H$/$K;XDj$r$7$F$$$J$/$F$b!"(B -\TeX{}$B$,FbIt=hM}$G!"J8;z$N0LCV$rD4@0$7$?$j!"(B\cs{vbox}$B$KF~$l$?$j$9$k$?$a$K!"(B -$B;MJ,%"%-$,F~$i$:!"$=$N860x$b$o$+$i$J$$$H$$$&$3$H$,$"$k!#(B - -$B$=$3$G!"(Bp\TeX~2.1.5$B$G$O!"%F%-%9%H?t<0$NA08e$X$N;MJ,%"%-$NA^F~J}K!$rJQ99$7$?!#(B -$B$3$NJ8=q$G$O!"$=$N3HD%$K:]$7$F$N;EMM$NJQ99$K$D$$$F4JC1$K@bL@$r$7$F$$$k!#(B - -\section{p\TeX~2.1.4$B$^$G$N?t<0$NA08e(B} -p\TeX~2.1.4$B$G(B\footnote{$B$h$j@53N$K8@$($P!"(Bp\TeX~2.1.5 $\beta$~6$B$^$G(B}$B!"(B -$B%F%-%9%H?t<0$NA0$d8e$K;MJ,%"%-$,F~$i$J$$l9g(B -\item $B%7%U%H$5$l$?(B\cs{hbox}$B$H$J$k>l9g(B -\item \cs{vbox}$B$H$J$k>l9g(B -\end{itemize} - -\subsection{\cs{xspcode}$B$K$h$k1F6A$N>l9g(B} -\cs{xspcode}$B$*$h$S(B\cs{inhibitxspcode}$B$K$h$kM^@)$O!"$?$H$($P!"(B -$\alpha$$B$d(B$\beta$$B$NA08e$K%9%Z!<%9$,F~$i$J$$$H$$$&7k2L$r$b$?$i$9!#(B -$B$J$<$J$i$P!"(B$\alpha$$B$O(Bcmmi10$B$N(B\hex{0B}$B$N0LCV!"(B$\beta$$B$O(B\hex{0C}$B$N0LCV$K(B -$B$"$k$+$i$G$"$k!#$3$l$iJ8;z$N(B\cs{xspcode}$B$NCM$O%<%m!"$9$J$o$AA08e$X$N(B -$B;MJ,%"%-$rM^@)$9$k$H$$$&F0:n$r$9$k!#(B -$B$=$N7k2L!"A08e$K;MJ,%"%-$,F~$i$J$$$N$G$"$k!#(B - -\subsection{$B%7%U%H$5$l$?(B\cs{hbox}$B$H$J$k>l9g(B} -shift\_amount$B$,%<%m$G$J$$(B\cs{hbox}$B$NNc$H$7$F$O!"(B -$\sum$$B$d(B$\int$$B$d(B$x^2$$B$d(B$x_2$$B$d(B$\sqrt{\hbox{Var(X)}}$$B$J$I$r5s$2$i$l$k!#(B - -$\sum$$B$O(Bcmex10$B$N(B\hex{50}$B$N0LCV$K$"$j!"$3$l$O(Bcmr10$B$N(B``P''$B$HF1$80LCV(B -$B$J$N$G(B\cs{xspcode}$B$K$h$kM^@)$O]30$N(B\cs{hbox}$B$H$J$C$F$7$^$$!"(B -$BA08e$X$N;MJ,%"%-$,F~$i$J$/$J$k!#(B$\int$$B$bF1MM$G$"$k!#(B - -$x^2$$B$d(B$x_2$$B$J$I$N>l9g$O!">eIU$-(B/$B2l9g$O!"A4BN$,%7%U%H$5$l$?(B\cs{hbox}$B$H$7$FAH$_N)$F$i$l$k$N$G!"(B -$BA08e$K;MJ,%"%-$,F~$i$J$$!#(B - -\subsection{\cs{vbox}$B$H$J$k>l9g(B} -$B$=$NB>$K;MJ,%"%-$,F~$k2U=j$O!"(B -$B9g;z!"%Z%J%k%F%#!"%Y!<%9%i%$%sD4@0NL!"0EL[$N(B\cs{kern}$B$ND>A0$+D>8e(B -$B$@$1$G$"$k!#$3$l0J30$N2U=j$K$OF~$i$J$$!#(B -$B?t<0$NA08e$K8B$l$P!"$3$N$&$A$N!"(B\cs{vbox}$B$NA08e$K$OF~$i$J$$$H$$$&(B -$B@)8B$,Bg$-$/1F6A$r$7$F$$$k!#$?$H$($P!"(B$\frac{1}{k}$$B$H$$$C$?J,?t$d!"(B -$x_k^2$$B$N$h$&$K>eIU$-$H2J}$r;XDj$7$?$H$-$,!"$3$l$KEv$?$k!#(B - -$BJ,?t$N>l9g$O!":G=*E*$K(B\cs{vbox}$B$H$7$FAH$_N)$F$i$l$k!#(B -$B$=$N$?$a!"J,?t$NA08e$K;MJ,%"%-$,F~$i$J$/$J$k!#(B -$B>eIU$-$H2J}$,$"$k>l9g$O!"$=$l$i$,(B\cs{vbox}$B$KF~$l$i$l$k$?$a!"(B -$BF~$i$J$/$J$k$N$G$"$k!#>eIU$-$H2l9g$H>u67$O0[$J$k$,!"(B -$B7k2L$O0l=o$G$"$k!#(B - -\section{p\TeX~2.1.5 $\beta7$$B$G$N?t<0$NA08e(B} -$B:#$^$G$Nl9g!"%F%-%9%H$N:G8e$NJ8;z$H$N4X78$G(B -$BE,@Z$J%9%Z!<%9$rF~$l$k!#$3$3$G!"=>Mh$NF0:n$H0[$J$k$N$O!"?t<0FbIt$NJ8;z$N(B -\cs{xspcode}$B$"$k$$$O(B\cs{inhibitxspcode}$B$N@_Dj$rL5;k$9$k$h$&$K$7$?E@$G$"$k!#(B -$B$D$^$j!"?t<0Fb$NJ8;z$H$=$ND>A0$H$NJ8;z$,OBJ8$+2$J8$+$@$1$rD4$Y$F!"(B -$B;MJ,%"%-$+4A;z4V%9%Z!<%9$rA^F~$9$k$h$&$K$7$?!#(B -$B$3$NJQ99$G(B$\alpha$$B$d(B$\beta$$B$J$I$NJ8;z$NA0$K%9%Z!<%9$,F~$k$h$&$K$J$k!#(B - -$B?t<0$N3+;O%N!<%I$Nl9g$O!"$=$l$,2?$G$"$C$F$b(B -$B;MJ,%"%-$rF~$l$k!#$3$N=$@5$K$h$C$F!"?t<0$,%7%U%H$5$l$?(B\cs{hbox}$B$d(B -\cs{vbox}$B$N>l9g$G$"$C$F$b;MJ,%"%-$,F~$k!#(B -$B$3$N$h$&$J%\%C%/%9$K$J$k$H$-$O!">eIU$-(B/$B2l9g$J$I$G$"$k!#(B - -$B=*N;%N!<%I$N;~E@$G$O!"$3$N8e$KA^F~$9$k%9%Z!<%9$,7h$^$C$F$$$l$P$=$l$rMQ$$$k!#(B -$B$9$J$o$A!"?t<0$N:G8e$H$=$N8e$k$NJ8;z$,$H$b$KOBJ8$G$"$l$P4A;z4V%9%Z!<%9$r(B -$BA^F~$7!"$$$:$l$+$,2$J8$G$"$l$P;MJ,%"%-$rA^F~$9$k!#(B -$B$3$N$H$-$b!"?t<0FbIt$N:G8e$NJ8;z$N(B\cs{xspcode}$B$bL5;k$9$k$h$&$K$7!"(B -$\alpha$$B$d(B$\beta$$B$J$I$N8e$m$K$bF~$k$h$&$K$7$F$$$k!#(B - -$B%7%U%H$5$l$?(B\cs{hbox}$B$d(B\cs{vbox}$B$J$I$G=*N;$7$?$H$-$O!"(B -$BA0B&$K;MJ,%"%-$rF~$l$?$N$G!"9g$o$;$k0UL#$G8eB&$K$b;MJ,%"%-$rA^F~$9$k!#(B -$B$3$l$G(B$x^2$$B$d(B$\frac{dx}{dy}$$B$d(B$\sqrt{3}$$B$J$I$N8e$m$K$b%9%Z!<%9$,F~$k!#(B - -$B$J$*!"?t<0$ND>A0$NJ8;z$H?t<0FbIt$N@hF,J8;z$,$H$b$K2$J8$N>l9g!"(B -$B$"$k$$$O?t<0FbIt$N:G8e$H?t<0D>8e$,$H$b$K2$J8$N>l9g$O!"(B -\TeX{}$B$HF1$8$G$"$jFCJL$J%9%Z!<%9$rF~$l$J$$$N$O=>Mh$HF1$8$G$"$k!#(B - -\section{p\TeX~2.1.5 $\beta8$$B$G$N?t<0$NA08e(B} -p\TeX~2.1.5 $\beta8$$B$G$O!"C1=c$K%F%-%9%H?t<0$NA08e$K;MJ,%"%-$rF~$l$kJ}K!(B -$B$G$l$G=hM}$7$?>l9g!"(B -\begin{quote} -\kanjiskip=4pt \xkanjiskip=8pt -$B""""(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B""""(B - \quad($\beta7$\kern.25zw $BHG(B)\\ -$B""""(B\kern\xkanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B""""(B - \quad($\beta8$\kern.25zw $BHG(B)\\ -$B""""(B$$BI=LL@Q(B=4\pi r^2$$B""""(B - \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} -\end{quote} -$B$H$J$k!#$D$^$j!"(B$\beta7$$BHG$G$O?t<0FbIt$NJ8;z$HD>A0$NJ8;z$rHf3S$7$F$$$k$?$a!"(B -$BA0B&$K4A;z4V%9%Z!<%9$,F~$j!"8eB&$K;MJ,%"%-$,F~$k!#(B -$B0lJ}!"(B$\beta8$$BHG$G$O?t<0FbIt$NJ8;z$K4X78$J$/!"N>B&$K;MJ,%"%-$,F~$k!#(B - -$B$J$*!"N>B&$K;MJ,%"%-$,F~$k!#(B -\begin{quote} -\kanjiskip=4pt \xkanjiskip=8pt -$B""""(B\kern\xkanjiskip$\hbox{$BI=LL@Q(B}$\kern0pt $B""""(B - \quad ($\beta7$\kern.25zw $BHG(B)\\ -$B""""(B\kern\kanjiskip$\hbox{$BI=LL@Q(B}$\kern\kanjiskip $B""""(B - \quad\hbox{\kanjiskip=0pt($\beta7$\kern.25zw $BHG$r=$@5$7$?>l9g(B)}\\ -$B""""(B\kern\xkanjiskip$\hbox{$BI=LL@Q(B}$\kern\xkanjiskip $B""""(B - \quad ($\beta8$\kern.25zw $BHG(B)\\ -$B""""(B$\hbox{$BI=LL@Q(B}$$B""""(B - \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} -\end{quote} - -$B.$5$$$N$G!"0c$$$O$=$l$[$IL\N)$?$J$$$+$b$7$l$J$$!#(B -$B$7$+$7!"=DAH$K$7$?>l9g$O!"$D$.$N$h$&$J7k2L$H$J$k!#(B -\begin{quote} -\begin{minipage}{16zw} -$B"$"$(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip\raisebox{-.25zw}{$B"$"$(B} - \quad($\beta7$\kern.25zw $BHG(B)\\ -\\ -$B"$"$(B\kern\kanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B"$"$(B\\ - \hfill($\beta7$\kern.25zw $BHG$r=$@5$7$?>l9g(B)\\ -\\ -$B"$"$(B\kern\xkanjiskip$$BI=LL@Q(B=4\pi r^2$\kern\xkanjiskip $B"$"$(B - \quad($\beta8$\kern.25zw $BHG(B)\\ -\\ -$B"$"$(B$$BI=LL@Q(B=4\pi r^2$$B"$"$(B - \quad\hbox{\kanjiskip=0pt\xkanjiskip=.25zw ($B$3$NHG(B)} -\end{minipage} -\end{quote} -$\beta7$$B$N7k2L$r8+$k$HJ8;z4V$N%9%Z!<%9$O;EMM$I$*$j$K$J$C$F$$$k!#(B -$B$7$+$7!"%Y!<%9%i%$%s$ND4@0NL$,?t<0$N8e$m$GLa$C$F$$$J$$$H$$$&%P%0$,$"$k!#(B -$B$?$H$(%P%0$r=$@5$7$?$H$7$F$b!"7h$7$FFI$_$d$9$$$H$O;W$($J$$!#(B - -$B0J>e$N7k2L$rHf3S$9$k$H!"(B$\beta8$$B$NA^F~J}K!$N$[$&$,<+A3$G!"FI$_$d$9$$$h$&$K(B -$B;W$($k!#$^$?!"A^F~$5$l$k%9%Z!<%9$bA08e$NJ8;z!"?t<0Fb$NJ8;z$K4X78$J$/!"(B -$B;MJ,%"%-$H7h$^$C$F$$$k$N$G7k2L$,$o$+$j$d$9$$!#(B -$B$=$3$G!"(B$\beta8$$B$G$O!"$3$N@a$NKAF,$G=R$Y$?!"(B -\begin{center} -$BC1=c$K!"%F%-%9%H?t<0$NA08e$K;MJ,%"%-$rF~$l$k(B -\end{center} -$B$H$$$&;EMM$Go$NJ8>OFb$G$N%\%C%/%9$KBP$9$kF0:n$bJQ$o$C$F$7$^$C$F$$$?!#$?$H$($P!"(B -\begin{quote} -\begin{verbatim} -$B""""(B\AA $B"$"$"$"$(B\hbox to0pt{ABC\hss}$B!{!{!{!{(B\hbox{}A\hbox{}$B""""""""(B -\end{verbatim} -\end{quote} -$B$,(B -\begin{quote} -\setbox0=\hbox{h}\dimenA=\ht0 \advance\dimenA-1ex -$B""""(B -\leavevmode\rlap{\raise.67\dimenA\hbox{\char'27}}\kern\xkanjiskip A% -\kern\xkanjiskip $B"$"$"$"$(B -\setbox0\hbox{ABC}\dimenA=\wd0\advance\dimenA-\xkanjiskip -\kern\xkanjiskip ABC\kern-\dimenA $B!{!{!{!{(B -\kern\xkanjiskip A\kern\xkanjiskip $B""""""""(B -\end{quote} -$B$H$J$k!#@h$[$I$N%j%9%H$r=hM}$7$F4|BT$9$k7k2L$O!"HE@$N0LCV$,La$i$J$$$7!"=hM}$NM^@)$b$5$l$J$/$J$C$F$$$?(B -\footnote{$B$3$l$i$NLdBj$O(B$\beta11$$B$G=$@5!#(B}$B!#(B - -\appendix -\section{$B<+F0A^F~$5$l$k%9%Z!<%9$Nl9g$K$h$C$F(B$\pm0.4$$B%]%$%s%HJ,$@$1?-=L!"(B -\cs{xkanjiskip}$B$OI8=`$G$=$N;~E@$NOBJ8%U%)%s%H$NI}$N(B$1/4$$B!"(B -$B>l9g$K$h$C$F(B$\pm1$$B%]%$%s%HJ,$@$1?-=L$7$F$bNI$$$H$$$&$3$H$r0UL#$7$F$$$k!#(B - -\cs{kanjiskip}$B$b(B\cs{xkanjiskip}$B$b!"CJMn$N=*$o$j$+!"(B\cs{hbox}$B$N:G8e$N;~E@(B -$B$NCM$,M-8z$H$J$k!#$7$?$,$C$F!"$R$H$D$NCJMnFb$d(B\cs{hbox}$BFb$GJ#?t2s;XDj$r(B -$B$7$F$b!"$=$N:G8e$N;XDj$K$h$C$F=hM}$5$l$k!#(B - -$B$?$@$7!V!"!W$d!V!J!W$N$h$&$K!"FCDj$NJ8;z$,O"B3$9$k>l9g!"$=$N$^$^A43QI}(B -$B$GJB$Y!"4V$K(B\cs{kanjiskip}$B$rA^F~$9$k$HJ8;z$N4V$,N%$l$9$.$F$7$^$&!#(B -$B$3$N$H$-$K$O!"(B\cs{kanjiskip}$B$G$O$J$/!"(BJFM(Japanese Font Metric)$B$G@_Dj(B -$B$5$l$F$$$k%9%Z!<%9$NNL$,;H$o$l$k!#(B - -\cs{xkanjiskip}$B$K4X$7$F$b!"OBJ8$H!V(B;$B!W!"!V(B($B!W$HOBJ8!"2$J8$H!V!#!W!"(B -$B!V!D!W$HA08e$N2$J8$N$h$&$J2U=j$K$O!"%9%Z!<%9$rA^F~$7$J$$$[$&$,$-$l$$$K(B -$B8+$($k!#$=$3$G!"FCDj$N2$J8$NJ8;z$KBP$7$F!"(B\cs{xkanjiskip}$B$NA^F~$r@)8f(B -$B$9$k$?$a$K(B\cs{xspcode}$B$,MQ0U$5$l$F$$$k!#(B -$BFCDj$NOBJ8$KBP$7$F$O(B\cs{inhibitxspcode}$B$rMQ$$$F@)8f$9$k!#(B - - -\section{$B%9%Z!<%9$K4X$9$k%W%j%_%F%#%V(B} -p\TeX{}$B$G3HD%$7$?!"%9%Z!<%9$K4X$9$k%W%j%_%F%#%V$O0J2<$N$H$*$j!#(B - -\subsection{\cs{kanjiskip}, \cs{autospacing}, \cs{noautospacing}} -\cs{kanjiskip}$B$O!"(B -$B4A;z$H4A;z$N4V$K<+F0E*$KA^F~$9$k%9%Z!<%9$NNL$r3JG<$9$kD9$5%l%8%9%?$G$"$k!#(B - -\cs{autospacing}$B$H(B\cs{noautospacing}$B$O!"(B -$B4A;z$H4A;z$N4V$K%9%Z!<%9$rA^F~$9$k$+$I$&$+$r;XDj$9$k$N$KMQ$$$k!#(B -\cs{autospacing}$B$r;XDj$9$k$H<+F0E*$KA^F~$5$l$k!#(B -\cs{noautospacing}$B$r;XDj$9$k$H4A;z4V$X$N%9%Z!<%9A^F~$OM^@)$5$l$k!#(B - -\subsection{\cs{xkanjiskip}, \cs{autoxspacing}, \cs{noautoxspacing}} -\cs{xkanjiskip}$B$O!"(B -$B4A;z$H1Q;z$N4V$K<+F0E*$KA^F~$9$k%9%Z!<%9$NNL$r3JG<$9$kD9$5%l%8%9%?$G$"$k!#(B - -\cs{autoxspacing}$B$H(B\cs{noautoxspacing}$B$O!"(B -$B4A;z$H1Q;z$N4V$K%9%Z!<%9$rA^F~$9$k$+$I$&$+$r;XDj$9$k$N$KMQ$$$k!#(B -\cs{autoxspacing}$B$r;XDj$9$k$H<+F0E*$KA^F~$5$l$k!#(B -\cs{noautoxspacing}$B$r;XDj$9$k$H4A;z4V$X$N%9%Z!<%9A^F~$OM^@)$5$l$k!#(B - -\subsection{\cs{xspcode}} -\cs{xspcode}$B$O!";XDj$7$?1Q;z$H4A;z$H$N4V$N%9%Z!<%9A^F~$r(B -$B$I$N$h$&$K(B\textgt{$B5v2D(B}$B$9$k$+$N@_Dj$r$9$k%W%j%_%F%#%V$G$"$k!#(B -$BF0:n$O!"$D$.$N$$$:$l$+$N?tCM$G;XDj$r$9$k!#(B - -\begin{center} -\begin{tabular}{ll} -0 & $BA08e$N4A;z$H$N4V$X$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ -1 & $BD>A0$N4A;z$H$N4V$K$@$1%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ -2 & $BD>8e$N4A;z$H$N4V$K$@$1%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ -3 & $BA08e$N4A;z$H$N4V$K%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ -\end{tabular} -\end{center} - -$B=i4|CM$O!"(B\texttt{[0-9A-Za-z]}$B$O#3!"$=$l0J30$O%<%m$K$J$C$F$$$k!#(B -$B$?$@$7!"0J2<$NJ8;z$K$D$$$F$O!"(Bkinsoku.tex$B$GJL$NCM$K=i4|2=$5$l$F$$$k!#(B -$B3g8LFb$O(BASCII$BJ8;z%3!<%I!J(B16$B?J?t!K$G$"$k!#(B - -\begin{center} -\begin{tabular}{l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l} -\texttt{(}=1 (\hex{28}) & \texttt{)}=2 (\hex{29}) & -\texttt{[}=1 (\hex{5B}) & \texttt{]}=2 (\hex{5D})\\ -\texttt{`}=1 (\hex{60}) & \texttt{'}=2 (\hex{27}) & -\texttt{;}=2 (\hex{3B}) & \texttt{,}=2 (\hex{2C})\\ -\texttt{.}=2 (\hex{2E}) \\ -\end{tabular} -\end{center} - -$B$?$@$7!"(B\cs{xspcode}$B$N@_Dj$O!"J8;z%3!<%I$KBP$7$F$G$"$j!"%U%)%s%H$K$h$C$F(B -$B0[$J$kCM$r;XDj$9$k$3$H$O$G$-$J$$!#$7$?$,$C$F(B\hex{60}$B$N0LCV$K$"$kJ8;z$O!"(B -cmr10$B$G$O(B``\textrm{`}'', cmmi10$B$G$O(B``$\ell$'', cmex10$B$G$O(B``$\coprod$''$B$G(B -$B$"$k$,!"$3$l$i$NJ8;z$O$9$Y$F(B\cs{xspcode}=1$B$H$7$F=hM}$5$l$k!#(B - -\subsection{\cs{inhibitxspcode}} -\cs{inhibitxspcode}$B$O!";XDj$7$?4A;z$H1Q;z$N4V$N%9%Z!<%9A^F~$r(B -$B$I$N$h$&$K(B\textgt{$BM^@)(B}$B$9$k$+$N@_Dj$r$9$k%W%j%_%F%#%V$G$"$k!#(B -$BF0:n$O!"$D$.$N$$$:$l$+$N?tCM$G;XDj$r$9$k!#(B - -\begin{center} -\begin{tabular}{ll} -0 & $B4A;z$H1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ -1 & $BD>A0$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ -2 & $BD>8e$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r6X;_$9$k!#(B\\ -3 & $BA08e$N1Q;z$H$N4V$N%9%Z!<%9$NA^F~$r5v2D$9$k!#(B\\ -\end{tabular} -\end{center} - -$B=i4|CM$O!"$9$Y$F$N4A;z$K$D$$$F#3$G$"$k!#(B -$B$?$@$7!"0J2<$NJ8;z$K$D$$$F$O!"(Bkinsoku.tex$B$GJL$NCM$K=i4|2=$5$l$F$$$k!#(B - -\begin{center} -\begin{tabular}{l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l@{\hspace{2.5zw}} - l@{\hspace{2.5zw}}l@{\hspace{2.5zw}}l} -$B!"(B=1 & $B!#(B=1 & $B!$(B=1 & $B!%(B=1 & $B!((B=1 & $B!)(B=1\\ -$B!J(B=2 & $B!K(B=1 & $B!N(B=2 & $B!O(B=1 & $B!P(B=2 & $B!Q(B=1\\ -$B!F(B=2 & $B!G(B=1 & $B!H(B=2 & $B!I(B=1 & $B!L(B=2 & $B!M(B=1\\ -$B!c(B=2 & $B!d(B=1 & $B!T(B=2 & $B!U(B=1 & $B!V(B=2 & $B!W(B=1\\ -$B!X(B=2 & $B!Y(B=1 & $B!Z(B=2 & $B![(B=1 & $B!](B=0 & $B!A(B=0\\ -$B!D(B=0 & $B!o(B=0 & $B!k(B=0 & $B!l(B=1 & $B!m(B=1\\ -\end{tabular} -\end{center} - -\end{document} diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/README.md texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/ptex/ptex-base/README.md 2017-08-27 23:51:34.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/ptex/ptex-base/README.md 2018-08-18 21:18:32.000000000 +0000 @@ -22,6 +22,6 @@ ## Release Date -2017-08-27 +2018-08-18 Japanese TeX Development Community diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/uplatex/base/README.md texlive-lang-2018.20180824/texmf-dist/doc/uplatex/base/README.md --- texlive-lang-2018.20180725/texmf-dist/doc/uplatex/base/README.md 2018-04-08 20:03:22.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/uplatex/base/README.md 2018-07-28 22:05:54.000000000 +0000 @@ -17,6 +17,6 @@ ## Release Date -2018-04-08 +2018-07-28 Japanese TeX Development Community Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/uplatex/base/uplatex-en.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/uplatex/base/uplatex-en.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/uplatex/base/uplatex.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/uplatex/base/uplatex.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/uplatex/base/upldoc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/uplatex/base/upldoc.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/xelatex/bidi/bidi-doc.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/xelatex/bidi/bidi.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/xelatex/bidi/bidi.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/xelatex/bidi/README texlive-lang-2018.20180824/texmf-dist/doc/xelatex/bidi/README --- texlive-lang-2018.20180725/texmf-dist/doc/xelatex/bidi/README 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/xelatex/bidi/README 2018-08-12 21:58:02.000000000 +0000 @@ -1,6 +1,6 @@ ___________________ The bidi package -v33.0 +v33.1 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -20,18 +20,24 @@ If you want to report any bugs or typos and corrections in the documentation, or ask for any new features, or suggest any -improvements, or ask any questions about the package, then +improvements, then please do not send any direct email to me; +I will not answer any direct email. Instead please use the issue tracker: + + + +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. + +If you want to ask any question about the package, then please do not send any direct email to me; I will not answer any -direct email. Instead please use the issue tracker: +direct email. Instead please ask your question at: - + -In doing so, please always explain your issue well enough, always -include a minimal working example showing the issue, and always -choose the appropriate label for your query (i.e. if you are reporting -any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. -Current version release date: 2018/06/15 +Current version release date: 2018/08/12 ___________________ Vafa Khalighi diff -Nru texlive-lang-2018.20180725/texmf-dist/doc/xelatex/xepersian/README texlive-lang-2018.20180824/texmf-dist/doc/xelatex/xepersian/README --- texlive-lang-2018.20180725/texmf-dist/doc/xelatex/xepersian/README 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/doc/xelatex/xepersian/README 2018-08-12 21:57:25.000000000 +0000 @@ -1,6 +1,6 @@ ____________________ The XePersian package -v21.2 +v21.3 The xepersian package provides a convenient interface for typesetting Persian and English texts in LaTeX, using XeTeX @@ -25,18 +25,24 @@ If you want to report any bugs or typos and corrections in the documentation, or ask for any new features, or suggest any -improvements, or ask any questions about the package, then +improvements, then please do not send any direct email to me; +I will not answer any direct email. Instead please use the issue tracker: + + + +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. + +If you want to ask any question about the package, then please do not send any direct email to me; I will not answer any -direct email. Instead please use the issue tracker: +direct email. Instead please ask your question at: - + -In doing so, please always explain your issue well enough, always -include a minimal working example showing the issue, and always -choose the appropriate label for your query (i.e. if you are reporting -any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. -Current version release date: 2018/06/15 +Current version release date: 2018/08/12 ______________ Vafa Khalighi persian-tex@tug.org Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/xelatex/xepersian/xepersian-doc.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/xelatex/xepersian/xepersian-doc.pdf differ Binary files /tmp/tmpTGTDOo/xmPPR3g5v6/texlive-lang-2018.20180725/texmf-dist/doc/xelatex/xepersian/xepersian.pdf and /tmp/tmpTGTDOo/RnrdSmtrVf/texlive-lang-2018.20180824/texmf-dist/doc/xelatex/xepersian/xepersian.pdf differ diff -Nru texlive-lang-2018.20180725/texmf-dist/scripts/texlive/NEWS texlive-lang-2018.20180824/texmf-dist/scripts/texlive/NEWS --- texlive-lang-2018.20180725/texmf-dist/scripts/texlive/NEWS 2018-05-30 22:58:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/scripts/texlive/NEWS 2018-07-25 03:49:36.000000000 +0000 @@ -1,7 +1,23 @@ (This file public domain. Originally written by Norbert Preining and Karl Berry, 2010.) -

    tlmgr XXXXX (released DDmmm18): +

    tlmgr NNNNN (released DDmmmYY): +

  • tlmgr info now allows listing only packages from the remote + repository using --only-remote. +
  • further checks on downloaded signature files to reduce + spurious warnings. +
  • prefer system provided binaries over TL provided binaries for + compressor and download programs. +
  • save alias information from TeX Catalogue. + + +

    tlmgr 47951 (released 07jun18): +

  • Backup removal for non-xz. + +

    tlmgr 47935 (released 05-06jun18): +

  • Bug fix for lz4 backups (need -m for normal behavior). + +

    tlmgr 47907 (released 03jun18):

  • support for curl as a download program, and new default behavior for choosing. In this order:
      diff -Nru texlive-lang-2018.20180725/texmf-dist/scripts/texlive/tlmgr.pl texlive-lang-2018.20180824/texmf-dist/scripts/texlive/tlmgr.pl --- texlive-lang-2018.20180725/texmf-dist/scripts/texlive/tlmgr.pl 2018-06-07 05:55:43.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/scripts/texlive/tlmgr.pl 2018-07-25 01:51:31.000000000 +0000 @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 47951 2018-06-07 05:55:43Z preining $ +# $Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $ # # Copyright 2008-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 47951 $'; -my $datrev = '$Date: 2018-06-07 07:55:43 +0200 (Thu, 07 Jun 2018) $'; +my $svnrev = '$Revision: 48271 $'; +my $datrev = '$Date: 2018-07-25 03:51:31 +0200 (Wed, 25 Jul 2018) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -215,7 +215,8 @@ "data" => "=s", "all" => 1, "list" => 1, - "only-installed" => 1 + "only-installed" => 1, + "only-remote" => 1 }, "run-post" => 0, "function" => \&action_info @@ -1547,6 +1548,10 @@ # INFO # sub action_info { + if ($opts{'only-installed'} && $opts{'only-remote'}) { + tlwarn("Are you joking? --only-installed and --only-remote cannot both be specified!\n"); + return($F_ERROR); + } init_local_db(); my ($what,@todo) = @ARGV; my $ret = $F_OK | $F_NOPOSTACTION; @@ -1613,8 +1618,10 @@ } else { @whattolist = $tlm->list_packages; } - # add also the local packages - TeXLive::TLUtils::push_uniq(\@whattolist, $localtlpdb->list_packages); + if (!$opts{'only-remote'}) { + # add also the local packages + TeXLive::TLUtils::push_uniq(\@whattolist, $localtlpdb->list_packages); + } } else { @whattolist = ($what, @todo); } @@ -1759,19 +1766,23 @@ my $oldwsloppy = ${^WIN32_SLOPPY_STAT}; ${^WIN32_SLOPPY_STAT} = 1; # + my $pkg; + my $rev; + my $ext; for my $dirent (@dirents) { + $pkg = ""; + $rev = ""; + $ext = ""; next if (-d $dirent); - my $has_accepted_compressiontype = 0; - for my $comptype (@AcceptedCompressors) { - my $ext = $CompressorExtension{$comptype}; - $has_accepted_compressiontype = 1 if ($dirent =~ m/\.tar\.$ext$/); - } - next if (!$has_accepted_compressiontype); - if ($dirent !~ m/^(.*)\.r([0-9]+)\.tar\.(.*)$/) { + if ($dirent =~ m/^(.*)\.r([0-9]+)\.tar\.$CompressorExtRegexp$/) { + $pkg = $1; + $rev = $2; + $ext = $3; + } else { next; } if (!$do_stat) { - $backups{$1}->{$2} = 1; + $backups{$pkg}->{$rev} = 1; next; } my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, @@ -1790,9 +1801,9 @@ if (!$usedt) { # stat failed, set key to -1 as a sign that there is a backup # but we cannot stat it - $backups{$1}->{$2} = -1; + $backups{$pkg}->{$rev} = -1; } else { - $backups{$1}->{$2} = $usedt; + $backups{$pkg}->{$rev} = $usedt; } } # reset the original value of the w32 sloppy mode for stating files @@ -1805,9 +1816,13 @@ # first remove the package, then reinstall it # this way we get rid of useless files my $restore_file; - for my $comptype (@AcceptedCompressors) { - my $ext = $CompressorExtension{$comptype}; - $restore_file = "$bd/${pkg}.r${rev}.tar.$ext" if (-r "$bd/${pkg}.r${rev}.tar.$ext"); + for my $ext (map {$Compressors{$_}{'extension'}} + sort {$Compressors{$a}{'priority'} <=> $Compressors{$a}{'priority'}} + keys %Compressors) { + if (-r "$bd/${pkg}.r${rev}.tar.$ext") { + $restore_file = "$bd/${pkg}.r${rev}.tar.$ext"; + last; + } } if (!$restore_file) { tlwarn("$prg: Cannot find restore file $bd/${pkg}.r${rev}.tar.*, no action taken\n"); @@ -2141,7 +2156,7 @@ clear_old_backups ($pkg, $opts{"backupdir"}, $opts{"clean"}, $opts{"dry-run"}, 1); } else { # for now default to xz and allow overriding with env var - my $compressorextension = $CompressorExtension{$::progs{'compressor'}}; + my $compressorextension = $Compressors{$::progs{'compressor'}}{'extension'}; my $tlp = $localtlpdb->get_package($pkg); info("saving current status of $pkg to $opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.$compressorextension\n"); @@ -2268,28 +2283,28 @@ tlwarn("$prg: Creation of backup container of $pkg failed.\n"); return 1; # backup failed? abort } - my $decompressor = $::progs{$DecompressorProgram{$DefaultCompressorFormat}}; - my $compressorextension = $CompressorExtension{$DefaultCompressorFormat}; - my @decompressorArgs = @{$DecompressorArgs{$DefaultCompressorFormat}}; + my $decompressor = $::progs{$DefaultCompressorFormat}; + my $compressorextension = $Compressors{$DefaultCompressorFormat}{'extension'}; + my @decompressorArgs = @{$Compressors{$DefaultCompressorFormat}{'decompress_args'}}; foreach my $pkg_part (@pkg_parts) { + my $dlcontainer = "$temp/$pkg_part.tar.$compressorextension"; if ($media eq 'local_compressed') { copy("$repo/$pkg_part.tar.$compressorextension", "$temp"); } else { # net - TeXLive::TLUtils::download_file("$repo/$pkg_part.tar.$compressorextension", - "$temp/$pkg_part.tar.$compressorextension"); + TeXLive::TLUtils::download_file("$repo/$pkg_part.tar.$compressorextension", $dlcontainer); } # now we should have the file present - if (!-r "$temp/$pkg_part.tar.$compressorextension") { + if (!-r $dlcontainer) { tlwarn("$prg: Couldn't get $pkg_part.tar.$compressorextension, that is bad\n"); return 1; # abort } # unpack xz archive - my $sysret = system("$decompressor @decompressorArgs < \"$temp/$pkg_part.tar.xz\" > \"$temp/$pkg_part.tar\""); + my $sysret = system("$decompressor @decompressorArgs < \"$dlcontainer\" > \"$temp/$pkg_part.tar\""); if ($sysret) { tlwarn("$prg: Couldn't unpack $pkg_part.tar.$compressorextension\n"); return 1; # unpack failed? abort } - unlink("$temp/$pkg_part.tar.$compressorextension"); # we don't need that archive anymore + unlink($dlcontainer); # we don't need that archive anymore } } @@ -3181,7 +3196,7 @@ } if ($opts{"backup"} && !$opts{"dry-run"}) { - my $compressorextension = $CompressorExtension{$::progs{'compressor'}}; + my $compressorextension = $Compressors{$::progs{'compressor'}}{'extension'}; $tlp->make_container($::progs{'compressor'}, $root, $opts{"backupdir"}, "${pkg}.r" . $tlp->revision, $tlp->relocated); @@ -3930,18 +3945,31 @@ sub show_one_package_list { my ($p, @rest) = @_; + my @out; + my $loctlp = $localtlpdb->get_package($p); + my $remtlp = $remotetlpdb->get_package($p) unless ($opts{'only-installed'}); + my $is_installed = (defined($loctlp) ? 1 : 0); + my $is_available = (defined($remtlp) ? 1 : 0); + if (!($is_installed || $is_available)) { + if ($opts{'only-installed'}) { + tlwarn("$prg: package $p not locally!\n"); + } else { + tlwarn("$prg: package $p not found neither locally nor remote!\n"); + } + return($F_WARNING); + } + my $tlp = ($is_installed ? $loctlp : $remtlp); my $tlm; if ($opts{"only-installed"}) { $tlm = $localtlpdb; } else { $tlm = $remotetlpdb; } - if (defined($localtlpdb->get_package($p))) { + if ($is_installed) { print "i "; } else { print " "; } - my $tlp = $tlm->get_package($p); if (!$tlp) { if ($remotetlpdb->is_virtual) { # we might have the case that a package is present in a @@ -7261,10 +7289,9 @@ my @dirents = readdir (DIR); closedir (DIR) || warn "closedir($backupdir) failed: $!"; my @backups; - my $extre = "(" . join("|", map { $CompressorExtension{$_} } @AcceptedCompressors) . ")"; for my $dirent (@dirents) { next if (-d $dirent); - next if ($dirent !~ m/^$pkg\.r([0-9]+)\.tar\.$extre$/); + next if ($dirent !~ m/^$pkg\.r([0-9]+)\.tar\.$CompressorExtRegexp$/); push @backups, [ $1, $dirent ] ; } my $i = 1; @@ -8031,6 +8058,13 @@ If this option is given, the installation source will not be used; only locally installed packages, collections, or schemes are listed. +=item B<--only-remote> + +Only list packages from the remote repository. Useful when checking what +is available in a remote repository using +C. Note that +C<--only-installed> and C<--only-remote> cannot both be specified. + =item B<--data C> If the option C<--data> is given, its argument must be a comma separated @@ -8144,7 +8178,7 @@ The C argument requires another argument, either a filename or C<-> for stdin, from which the key is added. The key is added to the -local keyring C, which is normally) +local keyring C, which is normally C. The C argument requires a key id and removes the requested id @@ -9695,7 +9729,7 @@ distribution (L) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 47951 2018-06-07 05:55:43Z preining $ +$Id: tlmgr.pl 48271 2018-07-25 01:51:31Z preining $ =cut # test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff -Nru texlive-lang-2018.20180725/texmf-dist/source/latex/bxjscls/bxjscls.dtx texlive-lang-2018.20180824/texmf-dist/source/latex/bxjscls/bxjscls.dtx --- texlive-lang-2018.20180725/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/latex/bxjscls/bxjscls.dtx 2018-08-23 21:57:31.000000000 +0000 @@ -56,7 +56,8 @@ %<*driver> \ProvidesFile{bxjscls.dtx} % - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] +% [2018/07/20 v1.9a BXJS document classes] % based on jsclasses [2018/06/23] % [2018/04/19 v1.9 BXJS document classes] % [2018/04/14 v1.8b BXJS document classes] @@ -10193,6 +10194,16 @@ \RequirePackage{bxjspandoc} % \end{macrocode} % +% |etoolbox| の |\AtEndPreamble| のフックを用意する。 +% \begin{macrocode} +\@onlypreamble\bxjs@endpreamble@hook +\let\bxjs@endpreamble@hook\@empty +\ifjsWitheTeX + \RequirePackage{etoolbox}[2010/08/21]% v2.0 + \AtEndPreamble{\bxjs@endpreamble@hook} +\fi +% \end{macrocode} +% %^^A---------------- %\subsection{duploadシステム} % @@ -10249,6 +10260,7 @@ % これを防ぐため、とりあえず両パッケージを無効化しておく。 % % \begin{macrocode} +\newif\ifbxjs@lang@exists \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0 % \end{macrocode} % Polyglossiaについて。 @@ -10256,7 +10268,8 @@ \pandocSkipLoadPackage{polyglossia} \bxjs@set@dupload@proc{polyglossia.sty}{% \ClassWarning\bxjs@clsname - {Loading of polyglossia is blocked}} + {Loading of polyglossia is blocked}% + \bxjs@lang@existstrue} \ifx\setmainlanguage\@undefined \newcommand*\setmainlanguage[2][]{} \newcommand*\setotherlanguage[2][]{% @@ -10269,6 +10282,10 @@ \@for\bxjs@tmpa:={#2}\do{% \setotherlangauge{\bxjs@tmpa}}} \fi +\g@addto@macro\bxjs@endpreamble@hook{% + \ifbxjs@lang@exists\else + \csundef{ver@polyglossia.sty}% + \fi} \else % \end{macrocode} % Babelについて。 @@ -10276,10 +10293,15 @@ \pandocSkipLoadPackage{babel} \bxjs@set@dupload@proc{babel.sty}{% \ClassWarning\bxjs@clsname - {Loading of babel is blocked}} + {Loading of babel is blocked}% + \bxjs@lang@existstrue} \let\foreignlanguage\@secondoftwo \let\otherlanguage\@gobble \let\endotherlanguage\@empty +\g@addto@macro\bxjs@endpreamble@hook{% + \ifbxjs@lang@exists\else + \csundef{ver@babel.sty}% + \fi} \fi % \end{macrocode} % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/luatex/luatexja/ltjclasses.dtx texlive-lang-2018.20180824/texmf-dist/source/luatex/luatexja/ltjclasses.dtx --- texlive-lang-2018.20180725/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/luatex/luatexja/ltjclasses.dtx 2018-07-28 22:07:14.000000000 +0000 @@ -115,6 +115,7 @@ % \changes{v1.7f}{2017/08/31}{和文書体の基準を全角空白から「漢」に変更} % \changes{v1.7g}{2017/09/19}{内部処理で使ったボックス0を空にした} % \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義} +% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} % \fi % % \iffalse @@ -144,7 +145,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -4448,8 +4449,11 @@ % \changes{v1.0h}{1996/12/17}{Typo:和歴 to 和暦} % |\today|コマンドの`年'を、 % 西暦か和暦のどちらで出力するかを指定するコマンドです。 +% 2018年7月以降の日本語\TeX{}開発コミュニティ版(v1.8)では、 +% デフォルトを和暦ではなく西暦に設定しています。 +% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} % \begin{macrocode} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} % \end{macrocode} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx texlive-lang-2018.20180824/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx --- texlive-lang-2018.20180725/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx 2018-08-03 21:17:14.000000000 +0000 @@ -44,7 +44,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2018/06/09 ltjsclasses ] + [2018/07/30 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass{ltjsarticle} @@ -623,6 +623,8 @@ % % [2016-11-24 LTJ] \texttt{autodetect-engine} はLua\TeX-jaでは意味がないので警告を表示させます． % +% [2018-07-30 LTJ] \texttt{uplatex} 指定時のエラーが正しく表示されなかったので修正しました． +% % \begin{macrocode} \newif\ifmingoth \mingothfalse @@ -631,11 +633,11 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassError{\jsc@clsname}{this class does not support `uplatex' option}} \DeclareOption{autodetect-engine}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -790,9 +792,13 @@ % % [2017-02-17 LTJ] |\directlua|中で出力される数字のカテゴリーコードが12になるようにしました． % この保証をしないと例えば\texttt{listings}パッケージで無限ループになります． +% +% [2018-07-02 LTJ] 10ptオプションが指定されており， +% 実際にはオプティカルサイズの補正が不要なときは「|xreal|オプションは指定されなかった」という +% 扱いにしておきます． % \begin{macrocode} \ifjsc@mag@xreal -\ifdim\jsc@mpt=\p@\else +\ifdim\jsc@mpt=\p@\jsc@mag@xrealfalse\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax @@ -3397,6 +3403,7 @@ % \end{macro} % % \begin{macro}{\paragraph} +% \begin{macro}{\jsParagraphMark} % % 見出しの後ろで改行されません。 % @@ -3425,6 +3432,7 @@ \fi % \end{macrocode} % \end{macro} +% \end{macro} % % \begin{macro}{\subparagraph} % @@ -4710,11 +4718,24 @@ % \end{macro} % % \begin{macro}{\@dottedtocline} +% \begin{macro}{\jsTocLine} % % \LaTeX 本体（\texttt{ltsect.dtx} 参照）での定義と同じですが， % |\@tempdima| を |\@lnumwidth| に変えています。 % +% [2018-06-23] デフォルトでは\jsTocLine のようにベースラインになります。\par +% これを変更可能にするため，|\jsTocLine| というマクロに切り出しました。 +% 例えば，仮想ボディの中央 +% {\renewcommand{\jsTocLine}{\leaders \hbox {\hss ・\hss}\hfill}\jsTocLine} +% に変更したい場合は +%\begin{verbatim} +% \renewcommand{\jsTocLine}{\leaders \hbox {\hss ・\hss}\hfill} +%\end{verbatim} +% とします。 +% % \begin{macrocode} +\def\jsTocLine{\leaders\hbox{% + $\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -4724,11 +4745,11 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} % \end{macrocode} % \end{macro} +% \end{macro} % % \paragraph{図目次と表目次} % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/jclasses.dtx texlive-lang-2018.20180824/texmf-dist/source/platex/base/jclasses.dtx --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/jclasses.dtx 2018-04-07 20:56:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/jclasses.dtx 2018-07-28 22:03:37.000000000 +0000 @@ -94,6 +94,7 @@ % \changes{v1.7f}{2017/08/31}{$BOBJ8=qBN$N4p=`$rA43Q6uGr$+$i!V4A!W$KJQ99(B} % \changes{v1.7g}{2017/09/19}{$BFbIt=hM}$G;H$C$?%\%C%/%9(B0$B$r6u$K$7$?(B} % \changes{v1.7h}{2018/02/04}{$BOBJ8%9%1!<%kCM(B\cs{Cjascale}$B$rDj5A(B} +% \changes{v1.8}{2018/07/03}{\cs{today}$B$N%G%U%)%k%H$rOBNq$+$i@>Nq$KJQ99(B} % \fi % % \iffalse @@ -123,7 +124,7 @@ %<11pt&bk>\ProvidesFile{tbk11.clo} %<12pt&bk>\ProvidesFile{tbk12.clo} % - [2018/02/04 v1.7h + [2018/07/03 v1.8 % Standard pLaTeX class] %<10pt|11pt|12pt> Standard pLaTeX file (size option)] %<*driver> @@ -4342,8 +4343,11 @@ % \changes{v1.0h}{1996/12/17}{Typo:$BOBNr(B to $BOBNq(B} % |\today|$B%3%^%s%I$N(B`$BG/(B'$B$r!"(B % $B@>Nq$+OBNq$N$I$A$i$G=PNO$9$k$+$r;XDj$9$k%3%^%s%I$G$9!#(B +% 2018$BG/(B7$B7n0J9_$NF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#HG(B(v1.8)$B$G$O!"(B +% $B%G%U%)%k%H$rOBNq$G$O$J$/@>Nq$K@_Dj$7$F$$$^$9!#(B +% \changes{v1.8}{2018/07/03}{\cs{today}$B$N%G%U%)%k%H$rOBNq$+$i@>Nq$KJQ99(B} % \begin{macrocode} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} % \end{macrocode} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/Makefile texlive-lang-2018.20180824/texmf-dist/source/platex/base/Makefile --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/Makefile 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/Makefile 2018-07-28 22:03:37.000000000 +0000 @@ -1,7 +1,7 @@ STRIPTARGET = platex.ltx jarticle.cls pl209.def platexrelease.sty \ jltxdoc.cls DOCTARGET = platex platexrelease pldoc exppl2e \ - platex-en + platex-en #pldoc-en PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) KANJI = -kanji=jis @@ -85,12 +85,12 @@ rm -f platex.cfg rm -f jltxdoc.cls pldoc.tex Xins.ins platex $(KANJI) pldocs.ins - rm -f mkpldoc.sh dstcheck.pl + rm -f mkpldoc*.sh dstcheck.pl platex $(KANJI) Xins.ins sh mkpldoc.sh rm *.aux *.log pldoc.toc pldoc.idx pldoc.ind pldoc.ilg rm pldoc.glo pldoc.gls pldoc.tex Xins.ins - rm ltxdoc.cfg pldoc.dic mkpldoc.sh dstcheck.pl + rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl exppl2e.dvi: exppl2e.sty rm -f platex.cfg @@ -108,6 +108,19 @@ rm platex-en.glo platex-en.gls platex-en.ilg rm platex.cfg +pldoc-en.dvi: $(PLDOC_SRC) + # built-in echo in shell is troublesome, so use perl instead + perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >platex.cfg + rm -f jltxdoc.cls pldoc.tex Xins.ins + platex $(KANJI) pldocs.ins + rm -f mkpldoc*.sh dstcheck.pl + platex $(KANJI) Xins.ins + sh mkpldoc-en.sh + rm *.aux *.log pldoc-en.toc pldoc-en.idx pldoc-en.ind pldoc-en.ilg + rm pldoc-en.glo pldoc-en.gls pldoc.tex Xins.ins + rm ltxdoc.cfg pldoc.dic mkpldoc*.sh dstcheck.pl + rm platex.cfg + platex.pdf: platex.dvi dvipdfmx $(FONTMAP) $< platexrelease.pdf: platexrelease.dvi @@ -118,6 +131,8 @@ dvipdfmx $(FONTMAP) $< platex-en.pdf: platex-en.dvi dvipdfmx $(FONTMAP) $< +pldoc-en.pdf: pldoc-en.dvi + dvipdfmx $(FONTMAP) $< .PHONY: install clean cleanstrip cleanall cleandoc install: diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/platex.dtx texlive-lang-2018.20180824/texmf-dist/source/platex/base/platex.dtx --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/platex.dtx 2018-04-09 21:13:34.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/platex.dtx 2018-07-28 22:03:37.000000000 +0000 @@ -33,7 +33,7 @@ % % \iffalse %<*driver|pldoc> -\def\eTeX{$\varepsilon$-\pTeX} +\def\eTeX{$\varepsilon$-\TeX} \def\pTeX{p\kern-.15em\TeX} \def\epTeX{$\varepsilon$-\pTeX} \def\pLaTeX{p\kern-.05em\LaTeX} @@ -218,9 +218,9 @@ %\ifJAPANESE % 2010$BG/0J9_!"%"%9%-!<(B\pTeX{}$B$O!"9q:]E*$K9-$/;H$o$l$F$$$k(B\TeX\ Live$B$H$$$&(B % $B%G%#%9%H%j%S%e!<%7%g%s$K -for f in pldoc.toc pldoc.idx pldoc.glo ; do -if [ -e $f ]; then rm $f; fi -done +%rm -f pldoc.toc pldoc.idx pldoc.glo +%rm -f pldoc-en.toc pldoc-en.idx pldoc-en.glo % \end{macrocode} %\ifJAPANESE % $B$=$7$F!"(B\file{ltxdoc.cfg}$B$r6u$K$7$^$9!#(B @@ -1349,7 +1348,8 @@ % Now process \file{pldoc.tex}. %\fi % \begin{macrocode} -platex pldoc.tex +%platex pldoc.tex +%platex -jobname=pldoc-en pldoc.tex % \end{macrocode} %\ifJAPANESE % $B:w0z$HJQ99MzNr$r:n@.$7$^$9!#(B @@ -1380,8 +1380,10 @@ % in dictionaries. (Makeindex does not have this option.) %\fi % \begin{macrocode} -mendex -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx -mendex -f -s gglo.ist -o pldoc.gls pldoc.glo +%mendex -s gind.ist -d pldoc.dic -o pldoc.ind pldoc.idx +%mendex -s gind.ist -d pldoc.dic -o pldoc-en.ind pldoc-en.idx +%mendex -f -s gglo.ist -o pldoc.gls pldoc.glo +%mendex -f -s gglo.ist -o pldoc-en.gls pldoc-en.glo % \end{macrocode} %\ifJAPANESE % \file{ltxdoc.cfg}$B$NFbMF$r(B|\includeonly{}|$B$K$7!"(B\file{pldoc.tex}$B$r=hM}$7$^$9!#(B @@ -1398,7 +1400,8 @@ %\fi % \begin{macrocode} echo "\includeonly{}" > ltxdoc.cfg -platex pldoc.tex +%platex pldoc.tex +%platex -jobname=pldoc-en pldoc.tex % \end{macrocode} %\ifJAPANESE % $B:G8e$K!":F$S(B\file{ltxdoc.cfg}$B$r6u$K$7$F!"(B\file{pldoc.tex}$B$r=hM}$r$7$^$9!#(B @@ -1410,7 +1413,8 @@ %\fi % \begin{macrocode} echo "" > ltxdoc.cfg -platex pldoc.tex +%platex pldoc.tex +%platex -jobname=pldoc-en pldoc.tex # EOT % % \end{macrocode} @@ -1650,7 +1654,8 @@ % \begin{macrocode} \generate{ \file{dstcheck.pl}{\from{platex.dtx}{plprog}} - \file{mkpldoc.sh}{\from{platex.dtx}{shprog}} + \file{mkpldoc.sh}{\from{platex.dtx}{shprog,ja}} + \file{mkpldoc-en.sh}{\from{platex.dtx}{shprog,en}} } \endbatchfile % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/platexrelease.dtx texlive-lang-2018.20180824/texmf-dist/source/platex/base/platexrelease.dtx --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/platexrelease.dtx 2018-05-20 21:31:08.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/platexrelease.dtx 2018-07-28 22:03:37.000000000 +0000 @@ -28,6 +28,9 @@ % (sync with latexrelease.dtx 2017/12/17 v1.0i)} % \changes{v1.0l}{2018/04/06}{Drop an extra period in warning message % (sync with latexrelease.dtx 2018/02/18 v1.0j)} +% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% current and latest options +% (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \fi % % \iffalse @@ -37,7 +40,7 @@ \ProvidesFile{platexrelease.dtx} % %\ProvidesPackage{platexrelease} - [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel + [2018/05/22 v1.0m latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] %<*driver> \documentclass{jltxdoc} @@ -215,18 +218,23 @@ % % \Lpack{platexrelease}$B%Q%C%1!<%8$N%*%W%7%g%s$rDj5A$7$^$9!#%3!<%I$O(B % \Lpack{latexrelease}$B$N$b$N$r(Bp\LaTeXe{}$BMQ$K=q$-49$($?$b$N$G$9!#(B +% \changes{v1.0m}{2018/05/22}{reset \cs{\requestedLaTeXdate} for +% current and latest options +% (sync with latexrelease.dtx 2018/05/08 v1.0k)} % \begin{macrocode} \DeclareOption*{% \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}% \let\requestedplpatchdate\CurrentOption} \DeclareOption{latest}{% - \let\requestedplpatchdate\platexreleaseversion} + \let\requestedplpatchdate\platexreleaseversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} \DeclareOption{current}{% - \let\requestedplpatchdate\pfmtversion} + \let\requestedplpatchdate\pfmtversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} % \end{macrocode} % % \begin{macrocode} -\ExecuteOptions{current} +\let\requestedplpatchdate\pfmtversion \ProcessOptions\relax % \end{macrocode} % @@ -316,6 +324,7 @@ some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 % * <2018-04-01>+1 diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/plfonts.dtx texlive-lang-2018.20180824/texmf-dist/source/platex/base/plfonts.dtx --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/plfonts.dtx 2018-05-11 22:01:19.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/plfonts.dtx 2018-07-28 22:03:37.000000000 +0000 @@ -84,13 +84,17 @@ % (sync with ltfinal.dtx 2018/04/08 v2.1d)} % \changes{v1.6p}{2018/04/09}{v1.6o$B$G2C$($?BP:v$r:o=|!#(B % $B;29M!'(Bplvers.dtx 2018/04/09 v1.1l$B$N(B\cs{everyjob}} +% \changes{v1.6q}{2018/07/03}{$B%7%j!<%:(Bb$B$,(Bbx$B$HEy2A$K$J$k$h$&$K@k8@(B} +% \changes{v1.6r}{2018/07/25}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} +% \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}$B%^%/%mDI2C(B} +% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{plfonts.dtx}[2018/04/09 v1.6p pLaTeX New Font Selection Scheme] +\ProvidesFile{plfonts.dtx}[2018/07/25 v1.6r pLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{plfonts.dtx} @@ -671,8 +675,8 @@ {\default@shape}}% \expandafter\let\csname#1-cmd\endcsname\@changed@cmd % \end{macrocode} -% \LaTeXe\ 2018-04-01$B!JM=Dj!K$G!"4{Dj$NF~NO%(%s%3!<%G%#%s%0$,(B -% UTF-8$B$K$J$j$^$9!#$3$l$O!"(B\file{latex.ltx}$B$,(B\file{utf8.def}$B!J=>Mh$O(B +% \LaTeXe\ 2018-04-01$B$G!"4{Dj$N2$J8F~NO%(%s%3!<%G%#%s%0$,(B +% UTF-8$B$K$J$j$^$7$?!#$3$l$O!"(B\file{latex.ltx}$B$,(B\file{utf8.def}$B!J=>Mh$O(B % \LaTeX{}$B%=!<%9$K(B |\usepackage[utf8]{inputenc}| $B$H=q$$$?$H$-$K(B % $BFI$_9~$^$l$F$$$?$b$N!K$rFI$_9~$`$3$H$Ge=q$-$7$^$9!#(B +% \begin{macrocode} +%%\plIncludeInRelease{0000/00/00}{\pltx@saved@oalign} +%% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +% +%%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@oalign} +% $B\plIncludeInRelease{2018/07/28}{\pltx@oalign} +% {Fix for non-zero baselineshift}% +%<*plcore|platexrelease> +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@oalign} +% {Fix for non-zero baselineshift}% +%\let\pltx@oalign\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@saved@ltx@sh@ft} +% |\b{...}|$B$H(B|\d{...}|$B$N9g@.J8;z$r=$@5$9$k$?$a!"(B +% \file{ltplain.dtx}$B$N(B|\ltx@sh@ft|$B$r>e=q$-$7$^$9!#(B +% \begin{macrocode} +%%\plIncludeInRelease{0000/00/00}{\pltx@saved@ltx@sh@ft} +%% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%IDI2C(B} +% \begin{macrocode} +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +% +%%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@ltx@sh@ft} +% $B\plIncludeInRelease{2018/07/28}{\pltx@ltx@sh@ft} +% {Fix for non-zero baselineshift}% +%<*plcore|platexrelease> +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +% +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@ltx@sh@ft} +% {Fix for non-zero baselineshift}% +%\let\pltx@ltx@sh@ft\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\g@tlastchart@} % \TeX\ Live 2015$B$GDI2C$5$l$?(B\cs{lastnodechar}$B$rMxMQ$7$F!"(B -% $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B\cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B -% $-1$$B$,JV$j$^$9!#(B +% $B!VD>A0$NJ8;z!W$NId9f0LCV$rF@$k%3!<%I$G$9!#(B +% \cs{lastnodechar}$B$,L$Dj5A$N>l9g$O(B$-1$$B$,JV$j$^$9!#(B % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B} % \begin{macrocode} %\plIncludeInRelease{2016/06/10}{\g@tlastchart@} @@ -1953,14 +2044,22 @@ % $B>l9g$KBhFs0z?t$NFbMF$KE83+$5$l!"$=$&$G$J$$>l9g$OBh;00z?t$NFbMF$KE83+$5$l$^$9!#(B % \changes{v1.6c}{2016/06/06}{$B%^%/%mDI2C(B} % \changes{v1.6d}{2016/06/19}{$B%"%/%;%s%HIU$-J8;z$r$5$i$K=$@5(B(forum:1951)} +% \changes{v1.6r}{2018/07/25}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} % \begin{macrocode} -%\plIncludeInRelease{2016/06/10}{\pltx@isletter} -% {Added \pltx@isletter}% +%\plIncludeInRelease{2018/07/28}{\pltx@isletter} +% {Support PD1 encoding}% %<*plcore|platexrelease> \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} \long\def\pltx@isletter#1{% \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% @@ -1973,10 +2072,31 @@ \long\def\pltx@isletter@iv#1#2#3\pltx@mark{% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\@secondoftwo}% - }{\@secondoftwo}} + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} % %\plEndIncludeInRelease +%\plIncludeInRelease{2016/06/10}{\pltx@isletter} +% {Added \pltx@isletter}% +%\def\pltx@mark{\pltx@mark@} +%\let\pltx@scanstop\relax +%\long\def\pltx@cond#1\fi{% +% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +%\long\def\pltx@isletter#1{% +% \expandafter\pltx@isletter@i#1\pltx@scanstop} +%\long\def\pltx@isletter@i#1\pltx@scanstop{% +% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% +% {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} +%\long\def\pltx@isletter@ii#1\pltx@scanstop#{% +% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% +% {\pltx@isletter@iii}{\pltx@isletter@iv}} +%\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} +%\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% +% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% +% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi +% {\@firstoftwo}{\@secondoftwo}% +% }{\@secondoftwo}} +%\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\pltx@isletter} % {Added \pltx@isletter}% %\let\pltx@isletter\@undefined @@ -1985,20 +2105,20 @@ % \end{macro} % % \begin{macro}{\@text@composite} -% $B9g@.J8;z$NFbItL?Na$G$9!#(Bv1.6a$B$G8m$C$F(B\LaTeX{}$B$NDj5A$r>e=q$-$7$F$7$^$$$^$7$?(B -% $B$,!"(Bv1.6c$B$G30$7$^$7$?!#(B +% $B9g@.J8;z$NFbItL?Na$G$9!#(B +% v1.6a$B$G8m$C$F(B\LaTeX{}$B$NDj5A$r>e=q$-$7$F$7$^$$$^$7$?$,!"(Bv1.6c$B$G30$7$^$7$?!#(B % \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B % \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$KBP1~$9$k$?$a:FDj5A(B} % \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N8m$C$?:FDj5A$r:o=|(B(forum:1941)} % \begin{macrocode} %\plIncludeInRelease{2016/06/10}{\@text@composite} -% {Wrong fix for non-zero baselineshift}% +% {Fix for non-zero baselineshift (wrong)}% %\def\@text@composite#1#2#3\@text@composite{% % \expandafter\@text@composite@x % \csname\string#1-\string#2\endcsname} %\plEndIncludeInRelease %\plIncludeInRelease{2016/04/17}{\@text@composite} -% {Wrong fix for non-zero baselineshift}% +% {Fix for non-zero baselineshift (wrong)}% %\def\@text@composite#1#2#3#{% % \begingroup % \setbox\z@=\hbox\bgroup% @@ -2007,7 +2127,7 @@ % \csname\string#1-\string#2\endcsname} %\plEndIncludeInRelease %\plIncludeInRelease{0000/00/00}{\@text@composite} -% {Wrong fix for non-zero baselineshift}% +% {Fix for non-zero baselineshift (wrong)}% %\def\@text@composite#1#2#3\@text@composite{% % \expandafter\@text@composite@x % \csname\string#1-\string#2\endcsname} @@ -2015,28 +2135,86 @@ % \end{macrocode} % \end{macro} % -% \begin{macro}{\@text@composite@x} -% $B9g@.J8;z$NFbItL?Na$G$9!#(B|\g@tlastchart@|$B$H(B|\pltx@isletter|$B$r;H$$$^$9!#(B -% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B -% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B} -% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B -% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B} -% \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B -% $B%H%i%V%k$,Aj\plIncludeInRelease{2016/07/01}{\@text@composite@x} +%%\plIncludeInRelease{0000/00/00}{\pltx@saved@text@composite@x} +%% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +% \end{macrocode} +% $B$^$:!"85$N(B\LaTeX{}$B$N%3!<%I$r%3%T!<$7$?$b$N$G$9!#(B +% $B@\F,<-(B|\pltx@saved...|$B$rIU$1$F$*$-$^$9!#(B +% \changes{v1.6r}{2018/07/25}{$B%3!<%I@0M}(B} +% \begin{macrocode} +\def\pltx@saved@text@composite@x#1{% + \ifx#1\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + #1} +% +%%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\pltx@text@composite@x} +% $B\plIncludeInRelease{2018/07/28}{\pltx@text@composite@x} % {Fix for non-zero baselineshift}% -%\def\@text@composite@x#1{% -% \ifx#1\relax -% \expandafter\@secondoftwo -% \else -% \expandafter\@firstoftwo -% \fi -% #1} +%<*plcore|platexrelease> +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup +% \end{macrocode} +% |#1|$B$rl9g$O(B$-1$$B$G$9!#(B +% \begin{macrocode} + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup +% \end{macrocode} +% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B +% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B|\xkanjiskip|$B$,A08e$KF~$k$h$&$K$7$^$9!#(B +% $B$3$3$G$O!"l9g$b2$J8J8;z$G$"$k$H2>Dj$7$F$$$^$9!#(B +% $B$^$?!"Id9f0LCV$Nl9g$O!"$=$N(B|\xspcode|$B$N>uBV$K1~$8$F!"(B +% $B?t<0%b!<%I$NA08e$K(B|\null|$B$rJd$C$F(B|\xkanjiskip|$B$NA^F~$rM^@)$7$^$9!#(B +% \begin{macrocode} + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi +% \end{macrocode} +% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,OBJ8J8;z$H?dB,$5$l$k>l9g$K$O!"(B +% $B%Y!<%9%i%$%sJd@5$r9T$o$:$K=PNO$7$^$9!#(B +% \begin{macrocode} + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} +% %\plEndIncludeInRelease -%\plIncludeInRelease{2016/06/10}{\@text@composite@x} +%\plIncludeInRelease{2016/06/10}{\pltx@text@composite@x} % {Fix for non-zero baselineshift}% -%\def\@text@composite@x#1#2{% +%\def\pltx@text@composite@x#1#2{% % \ifx#1\relax % #2% % \else\pltx@isletter{#1}{#1}{% @@ -2075,15 +2253,15 @@ % \fi\fi % \else % \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% -% \else\lower\@tempdima\box\z@\fi +% \else\leavevmode\lower\@tempdima\box\z@\fi % \fi % \endgroup}% % \fi %} %\plEndIncludeInRelease -%\plIncludeInRelease{2016/04/17}{\@text@composite@x} +%\plIncludeInRelease{2016/04/17}{\pltx@text@composite@x} % {Fix for non-zero baselineshift}% -%\def\@text@composite@x#1#2{% +%\def\pltx@text@composite@x#1#2{% % \ifx#1\relax % \expandafter\@secondoftwo % \else @@ -2104,15 +2282,96 @@ % \box\z@ % \endgroup} %\plEndIncludeInRelease -%\plIncludeInRelease{0000/00/00}{\@text@composite@x} +%\plIncludeInRelease{0000/00/00}{\pltx@text@composite@x} +% {Fix for non-zero baselineshift}% +%\let\pltx@text@composite@x\@undefined +%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\fixcompositeaccent} +% \begin{macro}{\nofixcompositeaccent} +% \begin{macro}{\@text@composite@x} +% $B>e5-(B2$BDL$j$NDj5A$N$&$A!"K\Ev$O(B\pLaTeX{}$B$NDj5A$rMQ$$$?$$$N$G$9$,!"(B +% $BA[Dj30$N%(%i!<$,H/@8$9$k$N$rKI$0$?$a!"(B +% $B%G%U%)%k%H$G$O(B\LaTeX{}$B$NDj5A$N$^$^$H$7$F$*$-$^$9!#(B +% $B$=$7$F!"(B|\fixcompositeaccent|$B$,M-8z$J;~$@$1(B\pLaTeX{}$B$NDj5A$rMQ$$$^$9!#(B +% |\nofixcompositeaccent|$B$O$3$NH]Dj$G$9!#(B +% \changes{v1.6r}{2018/07/25}{\cs{[no]fixcompositeaccent}$B%^%/%mDI2C(B} +% \begin{macrocode} +%%\plIncludeInRelease{0000/00/00}{\@text@composite@x} +%% {Special case! (This block is required for any emulation date)}% +%<*plcore|platexrelease> +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent +% +%%\plEndIncludeInRelease +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@text@composite@x} +% $B%(%_%e%l!<%7%g%s@lMQ$N%3!<%I$G$9!#(B +% \changes{v1.6a}{2016/04/01}{$B%Y!<%9%i%$%sJd@5NL$,(B0$B$G$J$$$H$-$K(B +% \cs{AA}$B$J$I0lIt$N9g@.J8;z$,$*$+$7$/$J$k$3$H$X$NBP1~!#(B} +% \changes{v1.6c}{2016/06/06}{v1.6a$B$G$N=$@5$G(B\'e $B$J$IA4$F$N%"%/%;%s%HIU$-J8;z$G(B +% $B<~0O$K(B\cs{xkanjiskip}$B$,F~$i$J$/$J$C$F$$$?$N$r=$@5!#(B} +% \changes{v1.6e}{2016/06/26}{v1.6a$B0J9_$N=$@5$GA4$F$N%"%/%;%s%HIU$-J8;z$G(B +% $B%H%i%V%k$,Aj\plIncludeInRelease{2018/07/28}{\fixcompositeaccent} +% {Fix for non-zero baselineshift}% +%\nofixcompositeaccent % force LaTeX original (conditional default) +%% other commands are actually defined for pLaTeX2e 2018-07-28 +%\plEndIncludeInRelease +%\plIncludeInRelease{2016/07/01}{\fixcompositeaccent} +% {Fix for non-zero baselineshift}% +%\nofixcompositeaccent % force LaTeX original (always) +%\let\fixcompositeaccent\@undefined +%\let\nofixcompositeaccent\@undefined +%\let\pltx@saved@oalign\@undefined +%\let\pltx@oalign\@undefined +%\let\pltx@saved@ltx@sh@ft\@undefined +%\let\pltx@ltx@sh@ft\@undefined +%\let\pltx@saved@text@composite@x\@undefined +%\let\pltx@text@composite@x\@undefined +%\plEndIncludeInRelease +%\plIncludeInRelease{2016/04/17}{\fixcompositeaccent} +% {Fix for non-zero baselineshift}% +%\fixcompositeaccent % force pLaTeX definition (always) +%\let\oalign\pltx@saved@oalign % no fix at that time +%\let\ltx@sh@ft\pltx@saved@ltx@sh@ft % no fix at that time +%\let\fixcompositeaccent\@undefined +%\let\nofixcompositeaccent\@undefined +%\let\pltx@saved@oalign\@undefined +%\let\pltx@oalign\@undefined +%\let\pltx@saved@ltx@sh@ft\@undefined +%\let\pltx@ltx@sh@ft\@undefined +%\let\pltx@saved@text@composite@x\@undefined +%\let\pltx@text@composite@x\@undefined +%\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\fixcompositeaccent} % {Fix for non-zero baselineshift}% -%\def\@text@composite@x#1{% -% \ifx#1\relax -% \expandafter\@secondoftwo -% \else -% \expandafter\@firstoftwo -% \fi -% #1} +%\nofixcompositeaccent % force LaTeX original (always) +%\let\fixcompositeaccent\@undefined +%\let\nofixcompositeaccent\@undefined +%\let\pltx@saved@oalign\@undefined +%\let\pltx@oalign\@undefined +%\let\pltx@saved@ltx@sh@ft\@undefined +%\let\pltx@ltx@sh@ft\@undefined +%\let\pltx@saved@text@composite@x\@undefined +%\let\pltx@text@composite@x\@undefined %\plEndIncludeInRelease % \end{macrocode} % \end{macro} @@ -2462,13 +2721,15 @@ %\ProvidesFile{jy1gt.fd} %\ProvidesFile{jt1mc.fd} %\ProvidesFile{jt1gt.fd} -% [2018/02/04 v1.6l KANJI font defines] +% [2018/07/03 v1.6q KANJI font defines] % \end{macrocode} % $B2#AHMQ!"=DAHMQ$H$b$K!"(B % $BL@D+BN$N%7%j!<%:(B|bx|$B$,%4%7%C%/BN$H$J$k$h$&$K@k8@$7$F$$$^$9!#(B -% \changes{v1.2}{1995/11/24}{it, sl, sc $B$N@k8@$r30$7$?(B} +% \changes{v1.2}{1995/11/24}{it, sl, sc$B$N@k8@$r30$7$?(B} % \changes{v1.3b}{1997/01/29}{$B%U%)%s%HDj5A%U%!%$%k$N%5%$%:;XDj$ND4@0(B} % \changes{v1.3b}{1997/03/11}{$B$9$Y$F$N%5%$%:$r%m!<%I2DG=$K$7$?(B} +% $B$^$?!"%7%j!<%:(B|b|$B$OF1$8=qBN$N(B|bx|$B$HEy2A$K$J$k$h$&$K@k8@$7$^$9!#(B +% \changes{v1.6q}{2018/07/03}{$B%7%j!<%:(Bb$B$,(Bbx$B$HEy2A$K$J$k$h$&$K@k8@(B} % % p\LaTeX{}$B$G$O=>B0=qBN$K(BOT1$B%(%s%3!<%G%#%s%0$r;XDj$7$F$$$^$9!#(B % $B$^$?!"MW5a%5%$%:!J;XDj$5$l$?%U%)%s%H%5%$%:!K$,(B10pt$B$N$H$-!"(B @@ -2488,6 +2749,7 @@ <-> min10 }{} \DeclareFontShape{JY1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{mc}{b}{n}{<->ssub*mc/bx/n}{} % %<*JT1mc> \DeclareKanjiFamily{JT1}{mc}{} @@ -2498,6 +2760,7 @@ <-> tmin10 }{} \DeclareFontShape{JT1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{mc}{b}{n}{<->ssub*mc/bx/n}{} % %<*JY1gt> \DeclareKanjiFamily{JY1}{gt}{} @@ -2507,6 +2770,7 @@ <-> goth10 }{} \DeclareFontShape{JY1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{gt}{b}{n}{<->ssub*gt/bx/n}{} % %<*JT1gt> \DeclareKanjiFamily{JT1}{gt}{} @@ -2516,6 +2780,7 @@ <-> tgoth10 }{} \DeclareFontShape{JT1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{gt}{b}{n}{<->ssub*gt/bx/n}{} % % \end{macrocode} % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/platex/base/plnewsc11.tex texlive-lang-2018.20180824/texmf-dist/source/platex/base/plnewsc11.tex --- texlive-lang-2018.20180725/texmf-dist/source/platex/base/plnewsc11.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/platex/base/plnewsc11.tex 2018-07-28 22:03:37.000000000 +0000 @@ -0,0 +1,94 @@ +%% <2018-07-28> +\documentclass{plnews} + +\publicationyear{2018}% $BH/9TG/(B +\publicationmonth{07}% $BH/9T7n(B +\publicationissue{c11}% $BHV9f(B +\author{$BF|K\8l(B\TeX{}$B3+H/%3%_%e%K%F%#!J(B\texttt{https://texjp.org/}$B!K(B} + +\def\cs#1{\texttt{\char92 #1}} +\def\pTeX{p\kern-.15em\TeX} +\def\eTeX{$\varepsilon$-\TeX} +\def\epTeX{$\varepsilon$-\pTeX} +\def\pLaTeX{p\kern-.05em\LaTeX} +\def\pLaTeXe{p\kern-.05em\LaTeXe} + +\begin{document} + +\maketitle + +$B$3$NJ8=q$O%3%_%e%K%F%#HG(B\pLaTeXe\ \texttt{<2018-07-28>}$B$K$D$$$F!"(B +\pLaTeXe\ \texttt{<2018-05-20>}$B$+$i$N99?72U=j$r$^$H$a$?$b$N$G$9!#(B + + +\section{$BI8=`%/%i%9$N(B\cs{today}$B$r@>Nq$K(B} +\pLaTeX{}$BIUB0$NI8=`%/%i%9(B +(jarticle, jbook, jreport, tarticle, tbook, treport)$B$G$O!"(B +$B$3$l$^$G(B|\today|$BL?Na$GI=<($5$l$kF|IU$N%G%U%)%k%H$r(B +\begin{quote} +\$BOBNq(B\today +\end{quote} +$B$N$h$&$K859f$H$7$F$$$^$7$?!#(B +$B$7$+$7!"J?@.(B31$BG/!J(B2019$BG/!K$K2~85$,M=Dj$5$l$F$$$k$3$H$r5!$K!"(B +$B:#2s$N%j%j!<%9$+$i%G%U%)%k%H$r(B +\begin{quote} +\$B@>Nq(B\today +\end{quote} +$B$N$h$&$J@>Nq$KJQ99$7$^$7$?!#(B +u\pLaTeX{}$BIUB0$N%/%i%9$bF1MM$KJQ99$7$F$$$^$9!#(B + + +\section{$B%7%j!<%:(B\texttt{b}$B$bB@;z$K(B} +\LaTeX{}$BI8=`$G$O!"B@;z(B(|\bfseries|, |\textbf|)$B$r;XDj$9$k$H(B +{\fontseries{bx}\selectfont bold extended} (|bx|)$B$K@Z$jBX$o$j$^$9!#(B + +$B0lJ}!"(B\file{tgtermes}, \file{iwona}$B$J$I$N2$J8%U%)%s%H%Q%C%1!<%8$r(B +$B;H$&$H!"B@;z$,(B{\fontseries{b}\selectfont bold} (|b|)$B$KJQ$o$j$^$9!#(B + +$B=>Mh$N(B(u)\pLaTeX{}$B$G$O!"OBJ8$NB@;z$r%7%j!<%:(B|bx|$B$@$1$K3d$jEv$F!"(B +|b|$B$K$O2?$b@_Dj$7$F$$$^$;$s$G$7$?!#$=$N$?$a!"8el9g$K(B +\begin{quote}\scriptsize +\begin{verbatim} +LaTeX Font Warning: Font shape `JY1/mc/b/n' undefined +(Font) using `JY1/mc/m/n' instead on ... +\end{verbatim} +\end{quote} +$B$N$h$&$J7Y9p$,=P$F!VOBJ8$,B@;z$K$J$i$J$$!W$H$$$&5sF0$G$7$?!#(B +$B:#2s$+$i%7%j!<%:(B|b|$B$K$bOBJ8$NB@;z$r3d$jEv$F!"(B +$BB@;z$K$J$k$h$&$K$7$^$7$?!#(B + + +\section{$B%"%/%;%s%HJ8;z$N:F=$@5(B} +\pLaTeXe\ 2016/04/17$B$+$i(B2016/07/01$B$K$+$1$F!"(B +$B!V%Y!<%9%i%$%sJd@5NL$,%<%m$G$J$$>l9g$K%"%/%;%s%H9g@.J8;z$,Mp$l$k!W(B +$B$H$$$&%P%0$r=$@5$7$h$&$H;n$_$F$$$^$7$?!#(B +$B$3$N;~$O%H%i%V%k$,Ajl9g$O!"(B + $B$=$N%0%k!<%WFb$G$N$_=$@5%Q%C%A$,M-8z$G$9!#(B +\item |\nofixcompositeaccent|$BL?Na!Z?7@_![(B\\ + |\fixcompositeaccent|$B$N8z2L$rBG$A>C$7!"(B + $B85$N(B\LaTeX{}$B$NDj5A$KLa$7$^$9!#(B +\end{itemize} +|\fixcompositeaccent|$BL?Na$rH/9T$9$k$H!"(B +$B!V%Y!<%9%i%$%sJd@5NL$,%<%m$G$J$$>l9g$N%"%/%;%s%H$N9b$5!W(B +$B!V<~0O$NOBJ8J8;z$H$N4V$K<+F0A^F~$5$l$k(B|\xkanjiskip|$B!W$J$I$N(B +$B5sF0$,$[$\4|BTDL$j$K$J$j$^$9$,!"(B +$B0lIt(B\LaTeX{}$B$H$O0[$J$k5sF0!J7Y9p!&%(%i!l9g$,$"$j$^$9!#(B +$BI,MW$K1~$8$F(B|\fixcompositeaccent|$B$rM-8z2=!&L58z2=$9$k$3$H$G(B +$BBP=h$7$F$/$@$5$$!#(B + + +\section{$B3+H/HG$N%F%9%H$N$*4j$$(B} +$B%P%0Js9p$d$40U8+!"3+H/HG$NF~ %\edef\platexreleaseversion %<*plcore|platexrelease> - {2018-05-20} + {2018-07-28} % %<*plcore> \def\ppatch@level{0} @@ -303,10 +303,8 @@ % % \LaTeXe{}$B$N%P!<%8%g%sI=<($N8e$K;D$C$F$$$k%3!<%I$r!"(B % $B$=$N$^$^(B|\everyjob|$B$KDI2C$7$^$9!#(B -% $B$3$NCf$K$O!"(B|\typeout{Babel version}|$B$b4^$^$l$k(B -% $B$O$:$G$9!J(Bp\LaTeX{}$B$OFH<+$N%O%$%U%M!<%7%g%s!&%Q%?!<%s$rDj5A$7$F(B -% $B$$$J$$$N$G!"(B\TeX\ Live$B$NI8=`E*%$%s%9%H!<%k$G$OBe$o$j$K(B\LaTeX{}$B$,(B -% $BFI$_9~$s$G$$$k(BBabel$B%Q%C%1!<%8$N(B\file{hyphen.cfg}$B$,E,MQ$5$l$k$?$a!K!#(B +% ^^A Babel v3.20$B$^$G$O$3$NCf$K(B|\typeout{Babel version}|$B$b4^$^$l$F(B +% ^^A $B$$$^$7$?$,!"(BBabel v3.21$B$+$i$O$3$N%P%J! \ProvidesFile{pxrubrica.dtx} % - [2017/11/19 v1.3b PX Japanese-style ruby] + [2018/08/16 v1.3c PX Japanese-style ruby] %<*driver> \documentclass[uplatex]{jsarticle} \usepackage{doc} @@ -63,6 +63,12 @@ % \date{\fileversion \quad[\filedate]} % \maketitle % +% \begin{abstract} +% JIS$B5,3J!V(BJIS X~4051$B!W$*$h$S(BW3C$B5;=Q%N!<%H!VF|K\8lAHHG=hM}$NMW7o!W(B +% $B$G=R$Y$i$l$F$$$k$h$&$J!"(B +% $BF|K\$K$*$$$F0lHLE*$JMM<0$K=>$C$F%k%S$*$h$S7wE@$rIU$1$k5!G=$rDs6!$9$k!#(B +% \end{abstract} +% % \MakeShortVerb{\|} % % \setcounter{tocdepth}{3} @@ -84,21 +90,26 @@ % % $BK\%Q%C%1!<%8$GFH<+$N0UL#$r$b$DC18l$r5s$2$k!#(B % \begin{itemize} -% \item $BFM=P!'(B $B%k%SJ8;z=PNO$NC<$,?FJ8;z$h$j$b30B&$K$J$k$3$H!#(B -% \item $B?JF~!'(B $B%k%SJ8;z=PNO$,?FJ8;z$KNY@\$9$kJ8;z$N!J?eJ?!KNN0h$K(B -% $BG[CV$5$l$k$3$H!#(B +% \item $BFM=P!'(B $B%k%SJ8;z=PNO$NC<$,?FJ8;z$h$j$b30B&$K=P$k$3$H!#(B +% \item $B?JF~!'(B $B%k%SJ8;z=PNO$,?FJ8;z$KNY@\$9$kJ8;z$NNN0h(B +% $B!J?eJ?J}8~$K8+$?>l9g!K$KG[CV$5$l$k$3$H!#(B % \item $BOBJ8%k%S!'(B $B?FJ8;z$,OBJ8J8;z$G$"$k$3$H$rA[Dj$7$F=hM}$5$l$k%k%S!#(B % \item $B2$J8%k%S!'(B $B?FJ8;z$,2$J8J8;z$G$"$k$3$H$rA[Dj$7$F=hM}$5$l$k%k%S!#(B % \item $B%0%k!<%W!'(B $B%f!<%6$K$h$j;XDj$5$l$?!"?FJ8;zNs!&%k%SJ8;zNs$N=hM}C10L!#(B +% \item $B%/%i%9%?!'(B $BF~NOJ8;zNsCf$N(B |{ }| $B$G0O$C$?ItJ,$N$3$H!#(B +% \footnote{$BK\Mh$N(B{\LaTeX}$B$NMQ8l$G$O!V%0%k!<%W!W$H8F$V$,!"$3$3$G$O(B +% $B!V%0%k!<%W!W$,JL$N0UL#$r$b$D$N$GJL$NMQ8l$rEv$F$?!#(B} % \item $B!TJ8;z!U!'(B $B6QEy3d$j$K$*$$$FIT2DJ,$H$J$kC10L$N$3$H!#(B -% $BDL>o$O!"K\Mh$N0UL#$G$NJ8;z$H$J$k$,!"%f!<%6;XDj$GJQ99$G$-$k!#(B +% $BK\Mh$N0UL#$G$NJ8;z$NB>!"%/%i%9%?$b!TJ8;z!U$H07$o$l$k!#(B % \item $B%V%m%C%/!'(B $BJ#?t$N?FJ8;z!&%k%SJ8;z$N=8$^$j$G!"Bg0hE*$JG[CV7hDj$N(B % $B=hM}$NCf$GFbIt$NAjBP0LCV$,8GDj$5$l$F$$$k$b$N!#(B % \end{itemize} % -% $B$&!#(B +% $B$&!#(B % \begin{quote} -% $B%k%S!"?FJ8;z!"CfIU$-!"8*IU$-!"%b%N%k%S!"%0%k!<%W%k%S!"=O8l%k%S(B +% $B%k%S!"?FJ8;z!"CfIU$-!"8*IU$-!"%b%N%k%S!"%0%k!<%W%k%S!"=O8l%k%S!"7wE@(B % \end{quote} % % \subsection{$B%k%SMQL?Na(B} @@ -137,7 +148,7 @@ % \end{tabular} % \end{quote} % -% \jmeta{$BA0Jd=u@_Dj(B}$B$O0J2<$NCM$N2?$l$+!#(B +% \jmeta{$BA0Jd=u@_Dj(B}$B$O0J2<$NCM$N2?$l$+!JJ#?t;XDj2D!K!#(B % \begin{quote} % \begin{tabular}[t]{ll} % \texttt{:} & $BOB2$J84V6uGrA^F~(B \\ @@ -158,7 +169,7 @@ % \item $B%4!<%9%H=hM}$,M-8z$N>l9g$O$3$3$N@_Dj$OL5;k$5$l$k!#(B % \end{itemize} % -% \jmeta{$B%b!<%I(B}$B$O0J2<$NCM$N2?$l$+!#(B +% \jmeta{$B%b!<%I(B}$B$O0J2<$NCM$N2?$l$+!JJ#?t;XDj2D!K!#(B % \begin{quote} % \newcommand*\fro[1]{{\scriptsize($<$\,\textit{#1})}} % \begin{tabular}[t]{l@{ }ll} @@ -204,7 +215,7 @@ % $BJ#?t$"$k>l9g$O(B |m| $B$*$h$S(B |j| $B$HEy2A$K$J$k!#(B % \end{itemize} % -% \jmeta{$B8eJd=u@_Dj(B}$B$O0J2<$NCM$N2?$l$+!#(B +% \jmeta{$B8eJd=u@_Dj(B}$B$O0J2<$NCM$N2?$l$+!JJ#?t;XDj2D!K!#(B % \begin{quote} % \begin{tabular}[t]{ll} % \texttt{:} & $BOB2$J84V6uGrA^F~(B \\ @@ -248,7 +259,7 @@ % $BL$Dj5A$G$"$k>l9g$K$N$_Dj5A$5$l$k!#(B % $B$3$l$KBP$7$F(B |\jruby| $B$O>o$KDj5A$5$l$k!#(B % $B$J$*!"(B|\ruby| $B0J30$NL?Na!J(B|\jruby| $B$r4^$`!K$,Dj5A:Q$G$"$C$?(B -% $B!JL?NaL>$N>WFM!K>l9g$K$O%(%i!<$H$J$k!#(B +% $B!JL?NaL>$,>WFM$7$?!K>l9g$K$O%(%i!<$H$J$k!#(B % % \item |\aruby[|\jmeta{$B%*%W%7%g%s(B}|]{|\jmeta{$B?FJ8;z(B}^^A % |}{|\jmeta{$B%k%SJ8;z(B}|}| @@ -299,15 +310,57 @@ % % \end{itemize} % -% \subsection{$BF~NOJ8;zNs$N%0%k!<%W$N;XDj(B} +% \subsection{$B%k%SL?Na$NF~NOJ8;zNs$NF~NO5,B'(B} +% +% $B%k%S$N=hM}$G$OF~NOJ8;zNs!J?FJ8;zNs!&%k%SJ8;zNs!K$r(B +% $BJ8;zKh$KJ,2r$9$kI,MW$,$"$k!#(B +% $B$3$N$?$a!"%k%SL?Na$NF~NOJ8;zNs$O0lDj$N5,B'$K=>$C$F(B +% $B=q$+$l$kI,MW$,$"$k!#(B +% +% $B%k%SL?Na$NF~NOJ8;zNs$K$O0J2<$N$b$N$r4^$a$k$3$H$,$G$-$k!#(B +% +% \begin{itemize} +% \item \texttt{\vb}\Means $B%0%k!<%W$N6h@Z$j$rI=$9!#(B +% \begin{itemize} +% \item $B8=:_$NHG$G$O!"?FJ8;zNs$G%0%k!<%W6h@Z$j$rMxMQ$9$k5!G=$O$J$$!#(B +% \footnote{$B>-Mh$N5!G=3HD%$K$*$$$F!"?FJ8;zNs$,J#?t%0%k!<%W$r$b$D$h$&$J(B +% $B;HMQK!$,A[Dj$5$l$F$$$k!#(B}% +% $B=>$C$F!"?FJ8;zNsCf$K(B \texttt{\vb} $B$,$"$k$H>o$K%(%i!<$K$J$k!#(B +% \item $B%k%SJ8;zNsCf$G$O!"0l$D$N%0%k!<%W$,0l$D$N?FJ8;z$KBP1~$9$k(B +% $BHO0O$rI=$9!J%b%N%k%S!&=O8l%k%S$N>l9g!K!#(B +% \end{itemize} +% +% \item $BDL>oJ8;z(B\Means {\LaTeX}$B$NL?Na$dFCl9g!"(B +% $B$=$NJ8;z$OAHHG>e!HOBJ8J8;z$N$h$&$K!I?6Iq$&!#(B +% \end{itemize} +% +% \item $B%/%i%9%?(B\Means $B$9$J$o$A!"(B|{ }| $B$K0O$^$l$?%F%-%9%H!#(B +% $BA4BN$,0l$D$N!TJ8;z!U$H8+$J$5$l$k!#(B +% \begin{itemize} +% \item $B%/%i%9%?$NCf$G$OG$0U$N(B{\LaTeX}$B$N!H%$%s%i%$%s(B\mbox{$B!I(B}% +% \footnote{$B!V6/@)2~9T$d2~CJMn$r4^$^$J$$!W$H$$$&$3$H!#(B +% {\LaTeX}$B$NMQ8l$G$O!V(BLR$B%b!<%I!W$H8F$V!#(B}% +% $B$NL?Na$,;H$($k!#(B +%\begin{quote}\begin{verbatim} +%\ruby[j]{{\CID{7652}}$B>~6h(B}{$B$+$D(B|$B$7(B{\color{red}{$B$+(B}}|$B$/(B} +%\end{verbatim}\end{quote} +% \item $B%/%i%9%?Cf$N(B \texttt{\vb} $B$ODL>oJ8;z$H$7$F07$o$l$k!#(B +% \end{itemize} +% +% \Note $BNc30E*$K!"2$J8%k%S$N?FJ8;zNs$O!"$"$?$+$b$=$lA4BN$,(B +% $B0l$D$N%/%i%9%?$G$"$k$h$&$K?6Iq$&!#(B +% $B$D$^$j!"G$0U$N!H%$%s%i%$%s!I$NL?Na$,;H$($F!"(B +% $BA4BN$G0l$D$N2$J8J8;z$G$"$k$N$HF1MM$K?6Iq$&!#(B % -% $BF~NOJ8;zNs!J?FJ8;zNs(B -% \footnote{$B8e=R$NDL$j!"8=:_$NHG$G$O?FJ8;zNs$rJ#?t%0%k!<%W$K$9$k(B -% $B;HMQK!$OB8:_$7$J$$$?$a!"?FJ8;zNsCf$G$O!V(B\texttt{\vb}$B!W$O;H$o$l$J$$!#(B}% -% $B!&%k%SJ8;zNs!K$NCf$G!V(B\texttt{\vb}$B!W$O(B -% $B%0%k!<%W$N6h@Z$j$H$_$J$5$l$k!J$?$@$7(B |{ }| $B$NCf$K$"$k$b$N$O(B -% $BJ8;z$H$_$J$5$l$k!K!#(B +% \end{itemize} % +% \subsection{$B%k%SJ8;zNs$N%0%k!<%W$N;XDj(B} +% +% $B%k%SJ8;zNs$N(B \texttt{\vb} $B$O%0%k!<%W$N6h@Z$j$rI=$9!#(B % $BNc$($P!"%k%SJ8;zNs(B %\begin{quote}\begin{verbatim} %$B$8$f$/(B|$B$4(B @@ -316,8 +369,7 @@ % 1$BJ8;z$+$i$J$k!#(B % % $BD9$5$r9g$o$;$k$?$a$K6QEy3d$j$r9T$&>l9g!"$=$NJ,3d$NC10L$O(B -% $BDL>o$OJ8;z$G$"$k$,!"(B|{ }| $B$G0O$C$?$b$N$O(B1$BJ8;z$H$_$J$5$l$k(B -% $B!JK\J8=q$G$O$3$NC10L$N$3$H$r!TJ8;z!U$H5-$9!K!#(B +% $B!TJ8;z!U!JDL>oJ8;z$^$?$O%/%i%9%?!K$H$J$k!#(B % $BNc$($P(B %\begin{quote}\begin{verbatim} %$B%Y%/%?(B{\<$B!J!\:Y$r@bL@$9$k!#(B -% $B$J$*!"Hs3HD%5!G=$G$O?FJ8;z$N%0%k!<%W$O>o$K(B1$B$D$K8B$i$l$k!#(B % \begin{itemize} % \item $B%b%N%k%S!&=O8l%k%S$G$O?FJ8;zNs$N(B1$B$D$N!TJ8;z!U$K%k%SJ8;zNs$N(B % 1$B$D$N%0%k!<%W$,BP1~$9$k!#(B @@ -343,9 +393,6 @@ %\end{verbatim}\end{quote} % $B$O!"!V8^7n1+(B+$B$5$_$@$l!W$N(B1$B$D$N%V%m%C%/$+$i$J$k!#(B % \end{itemize} -% -% $B3HD%5!G=$G$O!"?FJ8;zNs$,J#?t%0%k!<%W$r$b$D$h$&$J;HMQK!$,(B -% $BB8:_$9$kM=Dj$G$"$k!#(B % % \subsection{$B%4!<%9%H=hM}(B} % @@ -561,7 +608,7 @@ % % \end{itemize} % -% \subsection{$B7wE@L?Na$N?FJ8;zNs(B} +% \subsection{$B7wE@L?Na$N?FJ8;zNs$NF~NO5,B'(B} % % $B7wE@IU2C$N=hM}$G$O?FJ8;zNs$rJ8;zKh$KJ,2r$9$kI,MW$,$"$k!#(B % $B$3$N$?$a!"7wE@L?Na$N?FJ8;zNs$O0lDj$N5,B'$K=>$C$F(B @@ -591,8 +638,8 @@ % $B!J(B\verb|\hspace{\kanjiskip}|$B!K$r=PNO$9$k@lMQ$N%^%/%m$rMQ0U$7$F(B % $B$*$/$HJXMx$+$b$7$l$J$$!#(B} % \end{itemize} -% \item $B%0%k!<%W(B\Means $B$9$J$o$A!"(B|{ }| $B$K0O$^$l$?G$0U$N%F%-%9%H!#(B -% $B%k%SL?Na$N%0%k!<%W$HF1MM$K!"0l$D$N!TJ8;z!U$H$7$F07$o$l!"(B +% \item $B%/%i%9%?(B\Means $B$9$J$o$A!"(B|{ }| $B$K0O$^$l$?G$0U$N%F%-%9%H!#(B +% $B%k%SL?Na$N%/%i%9%?$HF1MM$K!"0l$D$N!TJ8;z!U$H$7$F07$o$l!"(B % $BA4BN$KBP$7$F0l$D$N7wE@$,IU2C$5$l$k!#(B % \begin{itemize} % \item \PKN{japanese-otf}$B%Q%C%1!<%8$N(B |\CID| $BL?Na$N$h$&$J!"(B @@ -1013,7 +1060,7 @@ % \begin{macrocode} \def\pxrr@fatal@bad@movable{% \pxrr@fatal@error{% - Novable group ruby is not allowed here% + Movable group ruby is not allowed here% }\pxrr@eh@fatal } % \end{macrocode} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/Makefile texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/Makefile --- texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/Makefile 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/Makefile 2018-07-28 22:05:54.000000000 +0000 @@ -1,6 +1,6 @@ STRIPTARGET = uplatex.ltx ujarticle.cls DOCTARGET = uplatex upldoc \ - uplatex-en + uplatex-en #upldoc-en PDFTARGET = $(addsuffix .pdf,$(DOCTARGET)) DVITARGET = $(addsuffix .dvi,$(DOCTARGET)) KANJI = -kanji=utf8 @@ -50,12 +50,12 @@ rm -f uplatex.cfg rm -f upldoc.tex Xins.ins uplatex $(KANJI) upldocs.ins - rm -f mkpldoc.sh #dstcheck.pl + rm -f mkpldoc*.sh #dstcheck.pl uplatex $(KANJI) Xins.ins sh mkpldoc.sh rm *.aux *.log upldoc.toc upldoc.idx upldoc.ind upldoc.ilg rm upldoc.glo upldoc.gls upldoc.tex Xins.ins - rm ltxdoc.cfg upldoc.dic mkpldoc.sh #dstcheck.pl + rm ltxdoc.cfg upldoc.dic mkpldoc*.sh #dstcheck.pl uplatex-en.dvi: $(INTRODOC_SRC) # built-in echo in shell is troublesome, so use perl instead @@ -67,12 +67,27 @@ rm uplatex-en.glo uplatex-en.gls uplatex-en.ilg rm uplatex.cfg +upldoc-en.dvi: $(PLDOC_SRC) + # built-in echo in shell is troublesome, so use perl instead + perl -e "print \"\\\\newif\\\\ifJAPANESE\\n"\" >uplatex.cfg + rm -f upldoc.tex Xins.ins + uplatex $(KANJI) upldocs.ins + rm -f mkpldoc*.sh #dstcheck.pl + uplatex $(KANJI) Xins.ins + sh mkpldoc-en.sh + rm *.aux *.log upldoc-en.toc upldoc-en.idx upldoc-en.ind upldoc-en.ilg + rm upldoc-en.glo upldoc-en.gls upldoc.tex Xins.ins + rm ltxdoc.cfg upldoc.dic mkpldoc*.sh #dstcheck.pl + rm uplatex.cfg + uplatex.pdf: uplatex.dvi dvipdfmx $(FONTMAP) $< upldoc.pdf: upldoc.dvi dvipdfmx $(FONTMAP) $< uplatex-en.pdf: uplatex-en.dvi dvipdfmx $(FONTMAP) $< +upldoc-en.pdf: upldoc-en.dvi + dvipdfmx $(FONTMAP) $< .PHONY: install clean cleanstrip cleanall cleandoc install: diff -Nru texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/ujclasses.dtx texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/ujclasses.dtx --- texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/ujclasses.dtx 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/ujclasses.dtx 2018-07-28 22:05:54.000000000 +0000 @@ -105,6 +105,8 @@ % \changes{v1.7g-u00}{2017/09/19}{p\LaTeX{}用に追随} % \changes{v1.7h}{2018/02/04}{和文スケール値\cs{Cjascale}を定義} % \changes{v1.7h-u00}{2018/02/04}{p\LaTeX{}用に追随} +% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} +% \changes{v1.8-u00}{2018/07/03}{p\LaTeX{}用に追随} % \fi % % \iffalse @@ -134,7 +136,7 @@ %<11pt&bk>\ProvidesFile{utbk11.clo} %<12pt&bk>\ProvidesFile{utbk12.clo} % - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 % Standard upLaTeX class] %<10pt|11pt|12pt> Standard upLaTeX file (size option)] %<*driver> @@ -4354,8 +4356,11 @@ % \changes{v1.0h}{1996/12/17}{Typo:和歴 to 和暦} % |\today|コマンドの`年'を、 % 西暦か和暦のどちらで出力するかを指定するコマンドです。 +% 2018年7月以降の日本語\TeX{}開発コミュニティ版(v1.8)では、 +% デフォルトを和暦ではなく西暦に設定しています。 +% \changes{v1.8}{2018/07/03}{\cs{today}のデフォルトを和暦から西暦に変更} % \begin{macrocode} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} % \end{macrocode} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplatex.dtx texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplatex.dtx --- texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplatex.dtx 2018-04-08 20:03:22.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplatex.dtx 2018-07-28 22:05:54.000000000 +0000 @@ -37,7 +37,7 @@ % % \iffalse %<*driver|pldoc> -\def\eTeX{$\varepsilon$-\pTeX} +\def\eTeX{$\varepsilon$-\TeX} \def\pTeX{p\kern-.15em\TeX} \def\epTeX{$\varepsilon$-\pTeX} \def\pLaTeX{p\kern-.05em\LaTeX} @@ -1047,11 +1047,11 @@ % % \begin{macrocode} %<*shprog> -for f in upldoc.toc upldoc.idx upldoc.glo ; do -if [ -e $f ]; then rm $f; fi -done +%rm -f upldoc.toc upldoc.idx upldoc.glo +%rm -f upldoc-en.toc upldoc-en.idx upldoc-en.glo echo "" > ltxdoc.cfg -uplatex upldoc.tex +%uplatex upldoc.tex +%uplatex -jobname=upldoc-en upldoc.tex % \end{macrocode} %\ifJAPANESE % 変更履歴や索引の生成にはmendexを用いますが、 @@ -1069,12 +1069,16 @@ % therefore, we don't need to add \texttt{-kanji=utf8} explicitly.} %\fi % \begin{macrocode} -mendex -U -s gind.ist -d upldoc.dic -o upldoc.ind upldoc.idx -mendex -U -f -s gglo.ist -o upldoc.gls upldoc.glo +%mendex -U -s gind.ist -d upldoc.dic -o upldoc.ind upldoc.idx +%mendex -U -s gind.ist -d upldoc.dic -o upldoc-en.ind upldoc-en.idx +%mendex -U -f -s gglo.ist -o upldoc.gls upldoc.glo +%mendex -U -f -s gglo.ist -o upldoc-en.gls upldoc-en.glo echo "\includeonly{}" > ltxdoc.cfg -uplatex upldoc.tex +%uplatex upldoc.tex +%uplatex -jobname=upldoc-en upldoc.tex echo "" > ltxdoc.cfg -uplatex upldoc.tex +%uplatex upldoc.tex +%uplatex -jobname=upldoc-en upldoc.tex # EOT % % \end{macrocode} @@ -1126,7 +1130,8 @@ % % \begin{macrocode} \generate{ - \file{mkpldoc.sh}{\from{uplatex.dtx}{shprog}} + \file{mkpldoc.sh}{\from{uplatex.dtx}{shprog,ja}} + \file{mkpldoc-en.sh}{\from{uplatex.dtx}{shprog,en}} } \endbatchfile % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplfonts.dtx texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplfonts.dtx --- texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplfonts.dtx 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplfonts.dtx 2018-07-28 22:05:54.000000000 +0000 @@ -51,13 +51,15 @@ % up\LaTeX{}用の最小限の変更だけを定義するようにした} % \changes{v1.6l-u02}{2018/02/04}{p\LaTeX{}の変更に追随。 % (based on plfonts.dtx 2018/02/04 v1.6l)} +% \changes{v1.6q-u02}{2018/07/03}{p\LaTeX{}の変更に追随。 +% (based on plfonts.dtx 2018/07/03 v1.6q)} % \fi % % \iffalse %<*driver> \NeedsTeXFormat{pLaTeX2e} % \fi -\ProvidesFile{uplfonts.dtx}[2018/02/04 v1.6l-u02 upLaTeX New Font Selection Scheme] +\ProvidesFile{uplfonts.dtx}[2018/07/03 v1.6q-u02 upLaTeX New Font Selection Scheme] % \iffalse \documentclass{jltxdoc} \GetFileInfo{uplfonts.dtx} @@ -405,13 +407,15 @@ %\ProvidesFile{jy2gt.fd} %\ProvidesFile{jt2mc.fd} %\ProvidesFile{jt2gt.fd} -% [2018/02/04 v1.6l-u02 KANJI font defines] +% [2018/07/03 v1.6q-u02 KANJI font defines] % \end{macrocode} % 横組用、縦組用ともに、 % 明朝体のシリーズ|bx|がゴシック体となるように宣言しています。 -% \changes{v1.2}{1995/11/24}{it, sl, sc の宣言を外した} +% \changes{v1.2}{1995/11/24}{it, sl, scの宣言を外した} % \changes{v1.3b}{1997/01/29}{フォント定義ファイルのサイズ指定の調整} % \changes{v1.3b}{1997/03/11}{すべてのサイズをロード可能にした} +% また、シリーズ|b|は同じ書体の|bx|と等価になるように宣言します。 +% \changes{v1.6q}{2018/07/03}{シリーズbがbxと等価になるように宣言} % % p\LaTeX{}では従属書体にOT1エンコーディングを指定していましたが、 % up\LaTeX{}ではT1エンコーディングを用いるように変更しました。 @@ -429,6 +433,7 @@ \DeclareRelationFont{JY2}{mc}{bx}{}{T1}{cmr}{bx}{} \DeclareFontShape{JY2}{mc}{m}{n}{<->s*[0.962216]upjisr-h}{} \DeclareFontShape{JY2}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY2}{mc}{b}{n}{<->ssub*mc/bx/n}{} % %<*JT2mc> \DeclareKanjiFamily{JT2}{mc}{} @@ -436,18 +441,21 @@ \DeclareRelationFont{JT2}{mc}{bx}{}{T1}{cmr}{bx}{} \DeclareFontShape{JT2}{mc}{m}{n}{<->s*[0.962216]upjisr-v}{} \DeclareFontShape{JT2}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT2}{mc}{b}{n}{<->ssub*mc/bx/n}{} % %<*JY2gt> \DeclareKanjiFamily{JY2}{gt}{} \DeclareRelationFont{JY2}{gt}{m}{}{T1}{cmr}{bx}{} \DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjisg-h}{} \DeclareFontShape{JY2}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY2}{gt}{b}{n}{<->ssub*gt/bx/n}{} % %<*JT2gt> \DeclareKanjiFamily{JT2}{gt}{} \DeclareRelationFont{JT2}{gt}{m}{}{T1}{cmr}{bx}{} \DeclareFontShape{JT2}{gt}{m}{n}{<->s*[0.962216]upjisg-v}{} \DeclareFontShape{JT2}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT2}{gt}{b}{n}{<->ssub*gt/bx/n}{} % % \end{macrocode} % diff -Nru texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplvers.dtx texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplvers.dtx --- texlive-lang-2018.20180725/texmf-dist/source/uplatex/base/uplvers.dtx 2018-04-01 22:30:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/uplatex/base/uplvers.dtx 2018-07-28 22:05:54.000000000 +0000 @@ -153,10 +153,6 @@ % \begin{macro}{\everyjob} % up\LaTeXe{}が起動されたときに表示される文字列は、 % p\LaTeXe{}の中ですでに設定されています。 -% またup\LaTeX{}も独自のハイフネーション・パターンを定義していないので、 -% \TeX\ Liveの標準的インストールでは、代わりに\LaTeX{}が読み込んでいる -% Babelパッケージのものが適用されるはずです。 -% % \changes{v1.0w-u00}{2016/05/12}{起動時の文字列に入れるBabelのバージョンを % 元の\LaTeX{}のバナーから取得するコードを\file{uplatex.ini}から取り入れた % (based on plvers.dtx 2016/05/12 v1.0w)} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi-doc-intro.ltx 2018-08-12 21:58:02.000000000 +0000 @@ -19,16 +19,16 @@ * * Copyright (c) 2009--2018 Vafa Khalighi * -* v33.0, 2018/06/15 +* v33.1, 2018/08/12 * * License: LaTeX Project Public License, version * 1.3c or higher (your choice) * * Location on CTAN: /macros/xetex/latex/bidi * -* Issue tracker: https://gitlab.com/persian-tex/bidi/issues +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets * -* Support: persian-tex@tug.org +* Support: http://persian-tex.com * **************************************************** \end{verbatim} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi-doc-title.ltx 2018-08-12 21:58:02.000000000 +0000 @@ -3,7 +3,7 @@ \begin{document} \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ \LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -\large User documentation for \textcolor{blue!65!black}{version 33.0}} +\large User documentation for \textcolor{blue!65!black}{version 33.1}} \author{Vafa Khalighi\\ \url{persian-tex@tug.org}} \setcounter{page}{0} @@ -14,7 +14,7 @@ \textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} \Large -User documentation for \textcolor{blue!65!black}{version 33.0}} +User documentation for \textcolor{blue!65!black}{version 33.1}} \vskip 0pt plus 3fill \textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -40,17 +40,28 @@ \vskip 0pt plus 3fill {\color{red!85!black}\fbox{\begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule} If you want to report any bugs or typos and corrections in the documentation, -or ask for any new features, or suggest any improvements, or ask any questions -about the package, then please do not send any direct email to me; I will not +or ask for any new features, or suggest any improvements, then please do not send any direct email to me; I will not answer any direct email. Instead please use the issue tracker: \medskip - \centerline{\url{https://gitlab.com/persian-tex/bidi/issues}} + \centerline{\url{https://sourceforge.net/p/persian-tex-dist/tickets}} \medskip -In doing so, please always explain your issue well enough, always include -a minimal working example showing the issue, and always choose the appropriate -label for your query (i.e. if you are reporting any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always include +a minimal working example showing the issue. + +\bigskip + +If you want to ask any question about the package, then please do not send any direct email to me; I will not +answer any direct email. Instead please ask your question at: + +\medskip + \centerline{\url{http://persian-tex.com}} + +\medskip +In doing so, please always explain your issue well enough, and always include +a minimal working example showing the issue. + \end{minipage} }} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi.dtx texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi.dtx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/bidi/bidi.dtx 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/bidi/bidi.dtx 2018-08-12 21:58:02.000000000 +0000 @@ -5,7 +5,7 @@ %<*readme> ___________________ The bidi package -v33.0 +v33.1 This package provides a convenient interface for typesetting bidirectional texts in Plain TeX and LaTeX, using XeTeX engine. @@ -27,19 +27,26 @@ If you want to report any bugs or typos and corrections in the documentation, or ask for any new features, or suggest any -improvements, or ask any questions about the package, then +improvements, then please do not send any direct email to me; +I will not answer any direct email. Instead please use the issue tracker: + + + +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. + + +If you want to ask any question about the package, then please do not send any direct email to me; I will not answer any -direct email. Instead please use the issue tracker: +direct email. Instead please ask your question at: - + -In doing so, please always explain your issue well enough, always -include a minimal working example showing the issue, and always -choose the appropriate label for your query (i.e. if you are reporting -any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. -Current version release date: 2018/06/15 +Current version release date: 2018/08/12 ___________________ Vafa Khalighi @@ -236,7 +243,7 @@ \documentclass{ltxdoc} \input{bidi-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 33.0 of the bidi + pdftitle={Source documentation for version 33.1 of the bidi package}% } \EnableCrossrefs @@ -255,7 +262,7 @@ % \GetFileInfo{\jobname.dtx} % \title{\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}}\\ %\LARGE Bidirectional typesetting in plain \TeX{} and \LaTeX, using \XeTeX{} engine\\[5pt] -%\large Source documentation for \textcolor{blue!65!black}{version 33.0}} +%\large Source documentation for \textcolor{blue!65!black}{version 33.1}} % \author{Vafa Khalighi\\ % \url{persian-tex@tug.org}} %\setcounter{page}{0} @@ -266,7 +273,7 @@ %\textcolor{blue!65!black}{\Huge The \textsf{bidi} \textit{Package}} % %\Large -%Source documentation for \textcolor{blue!65!black}{version 33.0}} +%Source documentation for \textcolor{blue!65!black}{version 33.1}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -275,34 +282,45 @@ % %If you enjoy the \textsf{bidi} package and want to support %the project, then please consider donating to the project. -%It allows me to spend more time working on the \textsf{bidi} package, -%encourages me to continue, and is the perfect way to say +%It allows me to spend more time working on the \textsf{bidi} +%package, encourages me to continue, and is the perfect way to say %thank you! % -%You can use \textit{My PayPal.Me} to donate to the \textsf{bidi} -%package at +%You can use \textit{My PayPal.Me} to +%donate to the \textsf{bidi} package at % %\medskip % \centerline{\url{https://www.paypal.me/persiantex}} % %\medskip -%If you have a problem using -%\textit{My PayPal.Me}, then please email me at \url{persian-tex@tug.org}. +%If you have a problem using \textit{My PayPal.Me}, then please +%email me at \url{persian-tex@tug.org}. % %\vskip 0pt plus 3fill %{\color{red!85!black}\fbox{\begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule} %If you want to report any bugs or typos and corrections in the documentation, -%or ask for any new features, or suggest any improvements, or ask any questions -%about the package, then please do not send any direct email to me; I will not +%or ask for any new features, or suggest any improvements, then please do not send any direct email to me; I will not %answer any direct email. Instead please use the issue tracker: % %\medskip -% \centerline{\url{https://gitlab.com/persian-tex/bidi/issues}} +% \centerline{\url{https://sourceforge.net/p/persian-tex-dist/tickets}} +% +%\medskip +%In doing so, please always explain your issue well enough, and always include +%a minimal working example showing the issue. +% +%\bigskip +% +%If you want to ask any question about the package, then please do not send any direct email to me; I will not +%answer any direct email. Instead please ask your question at: +% +%\medskip +% \centerline{\url{http://persian-tex.com}} % %\medskip -%In doing so, please always explain your issue well enough, always include -%a minimal working example showing the issue, and always choose the appropriate -%label for your query (i.e. if you are reporting any bugs, choose `Bug' label). +%In doing so, please always explain your issue well enough, and always include +%a minimal working example showing the issue. +% %\end{minipage} %}} % @@ -322,7 +340,7 @@ %\iffalse %<*table> %\fi -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -1945,8 +1963,8 @@ % \section{File \texttt{bidi.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\bididate{2018/06/15} -\def\bidi@version{33.0} +\def\bididate{2018/08/12} +\def\bidi@version{33.1} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -1968,9 +1986,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/bidi^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/bidi/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \typeout{\@bidi@info} @@ -2028,6 +2046,10 @@ \newcommand*{\@bidi@pdfproducer}{% The bidi package, v\bidi@version, \bididate } +\newcommand*{\@bidi@pdfcustomproperties}{% + This is the bidi package, Version \bidi@version, + Released August 12, 2018. +} \@RTLmainfalse \AtBeginDocument{% \if@RTLmain\else @@ -2183,14 +2205,18 @@ \XeTeXinterchartoks \bidi@sepmark@charclass \bidi@digits@charclass = {\DigitsDotDashInterCharToks} \newcommand*{\DigitsDotDashInterCharToks}{\if@nonlatin\char"200F \fi} \AtEndDocument{% - \if@bidi@pdfm@mark - \special{pdf:% - docinfo<<% - /Creator(\@bidi@pdfcreator)% - /Producer(\@bidi@pdfproducer)% + \special{pdf:% + docinfo<<% + \if@bidi@pdfm@mark + /Creator(\@bidi@pdfcreator)% + /Producer(\@bidi@pdfproducer)% + \fi + /BIDI.Fullbanner(\@bidi@pdfcustomproperties)% + \if@bidi@csdef{@xepersian@pdfcustomproperties}{% + /XEPERSIAN.Fullbanner(\@xepersian@pdfcustomproperties)% + }{}% >>% }% - \fi } % \end{macrocode} % \iffalse @@ -2199,9 +2225,9 @@ %\fi % \section{File \texttt{bidi.tex}} % \begin{macrocode} -\def\bididate{2018/06/15} +\def\bididate{2018/08/12} \catcode`@=11 -\def\bidi@version{33.0} +\def\bidi@version{33.1} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -2223,9 +2249,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/bidi^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/bidi/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \message{\@bidi@info} @@ -2298,15 +2324,20 @@ \def\@bidi@pdfproducer{% The bidi package, v\bidi@version, \bididate } +\def\@bidi@pdfcustomproperties{% + This is the bidi package, Version \bidi@version, + Released August 12, 2018. +} \def\bidi@pdfm@mark{% - \if@bidi@pdfm@mark - \special{pdf:% - docinfo<<% - /Creator(\@bidi@pdfcreator)% - /Producer(\@bidi@pdfproducer)% + \special{pdf:% + docinfo<<% + \if@bidi@pdfm@mark + /Creator(\@bidi@pdfcreator)% + /Producer(\@bidi@pdfproducer)% + \fi + /BIDI.Fullbanner(\@bidi@pdfcustomproperties)% >>% }% - \fi } \def\bidipdfinfoon{\@bidi@pdfm@marktrue} \def\bidipdfinfooff{\@bidi@pdfm@markfalse} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc-intro.ltx texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc-intro.ltx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc-intro.ltx 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc-intro.ltx 2018-08-12 21:57:25.000000000 +0000 @@ -24,16 +24,16 @@ * * Copyright (c) 2008--2018 Vafa Khalighi * -* v21.2, 2018/06/15 +* v21.3, 2018/08/12 * * License: LaTeX Project Public License, version * 1.3c or higher (your choice) * * Location on CTAN: /macros/xetex/latex/xepersian * -* Issue tracker: https://gitlab.com/persian-tex/xepersian/issues +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets * -* Support: persian-tex@tug.org +* Support: http://persian-tex.com * **************************************************** \end{verbatim} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc.ltx texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc.ltx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc.ltx 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc.ltx 2018-08-12 21:57:25.000000000 +0000 @@ -1,7 +1,7 @@ \documentclass{ltxdoc} \input{xepersian-doc-preamble.ltx} \hypersetup{% - pdftitle={User documentation for version 21.2 of the XePersian + pdftitle={User documentation for version 21.3 of the XePersian package}% } \begin{document} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc-title.ltx texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc-title.ltx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian-doc-title.ltx 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian-doc-title.ltx 2018-08-12 21:57:25.000000000 +0000 @@ -3,7 +3,7 @@ \begin{document} \title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\ \LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt] -\large User documentation for \textcolor{blue!65!black}{version 21.2}} +\large User documentation for \textcolor{blue!65!black}{version 21.3}} \author{Vafa Khalighi\\ \url{persian-tex@tug.org}} \setcounter{page}{0} @@ -14,7 +14,7 @@ \textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}} \Large -User documentation for \textcolor{blue!65!black}{version 21.2}} +User documentation for \textcolor{blue!65!black}{version 21.3}} \vskip 0pt plus 3fill \textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -44,17 +44,28 @@ \vskip 0pt plus 3fill {\color{red!85!black}\fbox{\begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule} If you want to report any bugs or typos and corrections in the documentation, -or ask for any new features, or suggest any improvements, or ask any questions -about the package, then please do not send any direct email to me; I will not +or ask for any new features, or suggest any improvements, then please do not send any direct email to me; I will not answer any direct email. Instead please use the issue tracker: \medskip - \centerline{\url{https://gitlab.com/persian-tex/xepersian/issues}} + \centerline{\url{https://sourceforge.net/p/persian-tex-dist/tickets}} \medskip -In doing so, please always explain your issue well enough, always include -a minimal working example showing the issue, and always choose the appropriate -label for your query (i.e. if you are reporting any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always include +a minimal working example showing the issue. + +\bigskip + +If you want to ask any question about the package, then please do not send any direct email to me; I will not +answer any direct email. Instead please ask your question at: + +\medskip + \centerline{\url{http://persian-tex.com}} + +\medskip +In doing so, please always explain your issue well enough, and always include +a minimal working example showing the issue. + \end{minipage} }} diff -Nru texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian.dtx texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian.dtx --- texlive-lang-2018.20180725/texmf-dist/source/xelatex/xepersian/xepersian.dtx 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/source/xelatex/xepersian/xepersian.dtx 2018-08-12 21:57:25.000000000 +0000 @@ -5,7 +5,7 @@ %<*readme> ____________________ The XePersian package -v21.2 +v21.3 The xepersian package provides a convenient interface for typesetting Persian and English texts in LaTeX, using XeTeX @@ -30,21 +30,28 @@ and request my bank account details. -If you want to report any bugs or typos and corrections in the -documentation, or ask for any new features, or suggest any -improvements, or ask any questions about the package, then -please do not send any direct email to me; I will not answer any -direct email. Instead please use the issue tracker: +If you want to report any bugs or typos and corrections in the +documentation, or ask for any new features, or suggest any +improvements, then please do not send any direct email to me; +I will not answer any direct email. Instead please use the issue tracker: - + -In doing so, please always explain your issue well enough, always -include a minimal working example showing the issue, and always -choose the appropriate label for your query (i.e. if you are reporting -any bugs, choose `Bug' label). +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. -Current version release date: 2018/06/15 +If you want to ask any question about the package, then +please do not send any direct email to me; I will not answer any +direct email. Instead please ask your question at: + + + +In doing so, please always explain your issue well enough, and always +include a minimal working example showing the issue. + + +Current version release date: 2018/08/12 ______________ Vafa Khalighi persian-tex@tug.org @@ -172,7 +179,7 @@ \documentclass{ltxdoc} \input{xepersian-doc-preamble.ltx} \hypersetup{% - pdftitle={Source documentation for version 21.2 of the XePersian + pdftitle={Source documentation for version 21.3 of the XePersian package}% } \EnableCrossrefs @@ -191,7 +198,7 @@ % \GetFileInfo{\jobname.dtx} % \title{\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}}\\ %\LARGE Persian for \LaTeXe, using {\XeTeX} engine\\[5pt] -%\large Source documentation for \textcolor{blue!65!black}{version 21.2}} +%\large Source documentation for \textcolor{blue!65!black}{version 21.3}} % \author{Vafa Khalighi\\ % \url{persian-tex@tug.org}} %\setcounter{page}{0} @@ -202,7 +209,7 @@ %\textcolor{blue!65!black}{\Huge The \textsf{\XePersian} \textit{Package}} % %\Large -%Source documentation for \textcolor{blue!65!black}{version 21.2}} +%Source documentation for \textcolor{blue!65!black}{version 21.3}} % %\vskip 0pt plus 3fill %\textit{\large to my Master, \textbf{Ferdowsi The Great}} @@ -231,17 +238,28 @@ %\vskip 0pt plus 3fill %{\color{red!85!black}\fbox{\begin{minipage}{\dimexpr\textwidth-2\fboxsep-2\fboxrule} %If you want to report any bugs or typos and corrections in the documentation, -%or ask for any new features, or suggest any improvements, or ask any questions -%about the package, then please do not send any direct email to me; I will not +%or ask for any new features, or suggest any improvements, then please do not send any direct email to me; I will not %answer any direct email. Instead please use the issue tracker: % %\medskip -% \centerline{\url{https://gitlab.com/persian-tex/xepersian/issues}} +% \centerline{\url{https://sourceforge.net/p/persian-tex-dist/tickets}} +% +%\medskip +%In doing so, please always explain your issue well enough, and always include +%a minimal working example showing the issue. +% +%\bigskip +% +%If you want to ask any question about the package, then please do not send any direct email to me; I will not +%answer any direct email. Instead please ask your question at: +% +%\medskip +% \centerline{\url{http://persian-tex.com}} % %\medskip -%In doing so, please always explain your issue well enough, always include -%a minimal working example showing the issue, and always choose the appropriate -%label for your query (i.e. if you are reporting any bugs, choose `Bug' label). +%In doing so, please always explain your issue well enough, and always include +%a minimal working example showing the issue. +% %\end{minipage} %}} % @@ -260,7 +278,7 @@ %\iffalse %<*table> %\fi -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -3199,8 +3217,8 @@ % \section{File \texttt{xepersian.sty}} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\def\xepersian@version{21.2} -\def\xepersiandate{2018/06/15} +\def\xepersian@version{21.3} +\def\xepersiandate{2018/08/12} \ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space Persian typesetting in XeLaTeX] \RequirePackage{fontspec} @@ -3224,9 +3242,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/xepersian^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/xepersian/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \typeout{\@xepersian@info} @@ -3286,23 +3304,23 @@ \DeclareDocumentCommand \settextfont { O{} m O{} } { \__xepersian_main_settextfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_settextfont:nn { - \fontspec_set_family:Nnn \g__xepersian_persianfont_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \rmdefault \g__xepersian_persianfont_family + \fontspec_set_family:Nnn \l__xepersian_persianfont_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \rmdefault \l__xepersian_persianfont_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persianfont } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persianfont_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persianfont_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\rmdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_settextfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_settextfont_hook:nn \use_none:nn @@ -3310,16 +3328,17 @@ \DeclareDocumentCommand \settextdigitfont { O{} m O{} } { \__xepersian_main_settextdigitfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_settextdigitfont:nn { - \fontspec_set_family:Nnn \g__xepersian_textdigitfont_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \fontspec_set_family:Nnn \l__xepersian_textdigitfont_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} \use:x { \exp_not:n { \DeclareRobustCommand \xepersian@textdigitfont } { - \exp_not:N \fontfamily { \g__xepersian_textdigitfont_family } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_textdigitfont_family_tl } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -3352,28 +3371,29 @@ { \__xepersian_main_settextdigitfont:nn {#1,#3} {#2} \__xepersian_main_setmathdigitfont:nn {#1,#3} {#2} + \ignorespaces } \DeclareDocumentCommand \setlatintextfont { O{} m O{} } { \__xepersian_main_setlatintextfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setlatintextfont:nn { - \fontspec_set_family:Nnn \g__xepersian_latinfont_family {Mapping=tex-text,#1} {#2} + \fontspec_set_family:Nnn \l__xepersian_latinfont_family_tl {Mapping=tex-text,#1} {#2} \use:x { \exp_not:n { \DeclareRobustCommand \latinfont } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_latinfont_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_latinfont_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\rmdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setlatintextfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setlatintextfont_hook:nn \use_none:nn @@ -3383,17 +3403,23 @@ \DeclareDocumentCommand \defpersianfont { m O{} m O{} } { - \__xepersian_main_defpersianfont:nnn {#1} {#2,#4} {#3} + \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3} + \NewDocumentCommand + } +\DeclareDocumentCommand \redefpersianfont { m O{} m O{} } + { + \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3} + \RenewDocumentCommand } -\cs_new:Nn \__xepersian_main_defpersianfont:nnn +\cs_new:Nn \__xepersian_main_defpersianfont:nnnN { - \fontspec_set_family:cnn { g__xepersian_ \cs_to_str:N #1 _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2} {#3} + \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2} {#3} \use:x { - \exp_not:N \DeclareRobustCommand \exp_not:N #1 + \exp_not:N #4 \exp_not:N #1 {} { - \exp_not:N \fontfamily { \use:c {g__xepersian_ \cs_to_str:N #1 _family} } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \use:c {l__xepersian_ \cs_to_str:N #1 _family_tl } } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -3401,17 +3427,23 @@ \DeclareDocumentCommand \deflatinfont { m O{} m O{} } { - \__xepersian_main_deflatinfont:nnn {#1} {#2,#4} {#3} + \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3} + \NewDocumentCommand } -\cs_new:Nn \__xepersian_main_deflatinfont:nnn +\DeclareDocumentCommand \redeflatinfont { m O{} m O{} } + { + \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3} + \RenewDocumentCommand + } +\cs_new:Nn \__xepersian_main_deflatinfont:nnnN { - \fontspec_set_family:cnn { g__xepersian_ \cs_to_str:N #1 _family } {Mapping=tex-text,#2} {#3} + \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Mapping=tex-text,#2} {#3} \use:x { - \exp_not:N \DeclareRobustCommand \exp_not:N #1 + \exp_not:N #4 \exp_not:N #1 {} { - \exp_not:N \fontfamily { \use:c {g__xepersian_ \cs_to_str:N #1 _family} } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \use:c {l__xepersian_ \cs_to_str:N #1 _family_tl } } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -3451,23 +3483,23 @@ \DeclareDocumentCommand \setpersiansansfont { O{} m O{} } { \__xepersian_main_setpersiansansfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpersiansansfont:nn { - \fontspec_set_family:Nnn \g__xepersian_persiansffamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \persiansfdefault \g__xepersian_persiansffamily_family + \fontspec_set_family:Nnn \l__xepersian_persiansffamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \persiansfdefault \l__xepersian_persiansffamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persiansffamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persiansffamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persiansffamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\persiansfdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpersiansansfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpersiansansfont_hook:nn \use_none:nn @@ -3475,23 +3507,23 @@ \DeclareDocumentCommand \setpersianmonofont { O{} m O{} } { \__xepersian_main_setpersianmonofont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpersianmonofont:nn { - \fontspec_set_family:Nnn \g__xepersian_persianttfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \persianttdefault \g__xepersian_persianttfamily_family + \fontspec_set_family:Nnn \l__xepersian_persianttfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \persianttdefault \l__xepersian_persianttfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persianttfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persianttfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persianttfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\persianttdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpersianmonofont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpersianmonofont_hook:nn \use_none:nn @@ -3499,23 +3531,23 @@ \DeclareDocumentCommand \setnavarfont { O{} m O{} } { \__xepersian_main_setnavarfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setnavarfont:nn { - \fontspec_set_family:Nnn \g__xepersian_navarfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \navardefault \g__xepersian_navarfamily_family + \fontspec_set_family:Nnn \l__xepersian_navarfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \navardefault \l__xepersian_navarfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \navarfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_navarfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_navarfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\navardefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setnavarfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setnavarfont_hook:nn \use_none:nn @@ -3523,23 +3555,23 @@ \DeclareDocumentCommand \setpookfont { O{} m O{} } { \__xepersian_main_setpookfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpookfont:nn { - \fontspec_set_family:Nnn \g__xepersian_pookfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \pookdefault \g__xepersian_pookfamily_family + \fontspec_set_family:Nnn \l__xepersian_pookfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \pookdefault \l__xepersian_pookfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \pookfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_pookfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_pookfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\pookdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpookfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpookfont_hook:nn \use_none:nn @@ -3547,23 +3579,23 @@ \DeclareDocumentCommand \setsayehfont { O{} m O{} } { \__xepersian_main_setsayehfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setsayehfont:nn { - \fontspec_set_family:Nnn \g__xepersian_sayehfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \sayehdefault \g__xepersian_sayehfamily_family + \fontspec_set_family:Nnn \l__xepersian_sayehfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \sayehdefault \l__xepersian_sayehfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \sayehfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_sayehfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_sayehfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\sayehdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setsayehfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setsayehfont_hook:nn \use_none:nn @@ -3571,23 +3603,23 @@ \DeclareDocumentCommand \setiranicfont { O{} m O{} } { \__xepersian_main_setiranicfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setiranicfont:nn { - \fontspec_set_family:Nnn \g__xepersian_iranicfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \iranicdefault \g__xepersian_iranicfamily_family + \fontspec_set_family:Nnn \l__xepersian_iranicfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \iranicdefault \l__xepersian_iranicfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \iranicfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_iranicfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_iranicfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\iranicdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setiranicfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setiranicfont_hook:nn \use_none:nn @@ -3983,6 +4015,11 @@ The xepersian package, v\xepersian@version, \xepersiandate } +\newcommand*{\@xepersian@pdfcustomproperties}{% + This is the xepersian package, Version \xepersian@version, + Released August 12, 2018. +} + \newcommand\twocolumnstableofcontents{% \if@bidi@csundef{multi@column@out}{% \PackageError{xepersian}{Oops! you should load multicol package before xepersian package for being able to use this command}{}}{% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex 2018-07-27 22:09:48.000000000 +0000 @@ -0,0 +1,37 @@ +% filename: loadhyph-pi.tex +% language: pali +% +% Loader for hyphenation patterns, generated by +% source/generic/hyph-utf8/generate-pattern-loaders.rb +% See also http://tug.org/tex-hyphen +% +% Copyright 2008-2016 TeX Users Group. +% You may freely use, modify and/or distribute this file. +% (But consider adapting the scripts if you need modifications.) +% +% Once it turns out that more than a simple definition is needed, +% these lines may be moved to a separate file. +% +\begingroup +% Test for pTeX +\ifx\kanjiskip\undefined +% Test for native UTF-8 (which gets only a single argument) +% That's Tau (as in Taco or ΤΕΧ, Tau-Epsilon-Chi), a 2-byte UTF-8 character +\def\testengine#1#2!{\def\secondarg{#2}}\testengine Τ!\relax +\ifx\secondarg\empty + % Unicode-aware engine (such as XeTeX or LuaTeX) only sees a single (2-byte) argument + \message{UTF-8 Pali hyphenation patterns} + % Set \lccode for ZWNJ and ZWJ. + \lccode"200C="200C + \lccode"200D="200D + \input hyph-pi.tex +\else + % 8-bit engine (such as TeX or pdfTeX) + \message{No Pali hyphenation patterns - only for Unicode engines} + %\input zerohyph.tex +\fi\else + % pTeX + \message{No Pali hyphenation patterns - only for Unicode engines} + %\input zerohyph.tex +\fi +\endgroup diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex 2018-04-08 20:03:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-bg.tex 2018-07-27 22:09:48.000000000 +0000 @@ -3,11 +3,12 @@ % version: 21 October 2017 % language: % name: Bulgarian -% code: bg +% tag: bg % notice: > % This file is part of the hyph-utf8 package. % See http://www.hyphenation.org for more information. -% authors: +% authors: +% - % name: Anton Zinoviev % contact: anton:lml.bas.bg % licence: @@ -21,7 +22,7 @@ % SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT % OF THE USE OF THIS SOFTWARE. % hyphenmins: -% for_typesetting: +% typesetting: % left: 2 % right: 2 % changes: See below diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex 2018-07-27 22:09:48.000000000 +0000 @@ -0,0 +1,136 @@ +% copyright: Copyright (C) 2018 Wie-Ming Cittānurakkho Bhikkhu +% title: Pāli Hyphenation patterns +% version: 2018-06-29 +% language: +% name: Pāli +% tag: pi +% notice: > +% This file is part of the hyph-utf8 package. +% See http://www.hyphenation.org/tex for more information. +% authors: +% - +% name: Wie-Ming Cittānurakkho Bhikkhu +% contact: wiemingang:gmail.com +% licence: +% name: MIT +% url: https://opensource.org/licenses/MIT +% text: > +% Permission is hereby granted, free of charge, to any person +% obtaining a copy of this software and associated documentation +% files (the “Software”), to deal in the Software without +% restriction, including without limitation the rights to use, +% copy, modify, merge, publish, distribute, sublicense, and/or sell +% copies of the Software, and to permit persons to whom the +% Software is furnished to do so, subject to the following +% conditions: +% +% The above copyright notice and this permission notice shall be +% included in all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +% OTHER DEALINGS IN THE SOFTWARE. +% hyphenmins: +% typesetting: +% left: 1 +% right: 2 +% changes: +% - 2018-06-29 Initial release +% source: Generated manually +% ========================================== +\patterns{% +.n2h2ā3 +.n2t2 +a1 +2b3b2 +3b2h2 +2b3m2 +3b2r2 +3b2y2 +2c3c2 +3c2h2 +2d3d2 +3d2h2 +2d3m2 +3d2r2 +3d2v2 +e1 +2g3d2h2 +2g3g2 +3g2h2 +2g3r2 +2g3y2 +2h3m2 +2h3v2 +2h3y2 +i1 +3j2h2 +2j3j2 +3k2h2 +2k3k2 +2k3l2 +3k2r2 +3k2v2 +3k2y2 +2l3l2 +2l3y2 +2m3b2 +2m3h2 +2m3m2 +2m3p2 +2m3y2 +2n3d2 +2n1h2 +2n3n2 +2n1t2 +2n3v2 +o1 +3p2h2 +2p3l2 +2p3p2 +2s3m2 +3s2n2 +2s3s2 +2s3t2 +3s2v2 +3s2y2 +3t2h2 +2t3n2 +2t3r2 +2t3t2 +3t2v2 +3t2y2 +u1 +2v3h2 +3v2y2 +2y3h2 +3y2v2 +2y3y2 +2ñ3c2 +2ñ3h2 +2ñ3j2 +2ñ3ñ2 +ā1 +ī1 +ū1 +2ḍ3ḍ2 +3ḷ2h2 +2ṁ3 +2ṁ3n2h2 +2ṃ3 +2ṃ3n2h2 +2ṅ3g2 +2ṅ3k2 +2ṇ3h2 +2ṇ3y2 +2ṇ3ḍ2 +2ṇ3ṇ2 +2ṇ3ṭ2 +3ṭ2h2 +2ṭ3ṭ2 +} diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt 2018-04-08 20:03:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-bg.lic.txt 2018-07-27 22:09:48.000000000 +0000 @@ -3,11 +3,12 @@ % version: 21 October 2017 % language: % name: Bulgarian -% code: bg +% tag: bg % notice: > % This file is part of the hyph-utf8 package. % See http://www.hyphenation.org for more information. -% authors: +% authors: +% - % name: Anton Zinoviev % contact: anton:lml.bas.bg % licence: @@ -21,7 +22,7 @@ % SHALL THE AUTHOR BE LIABLE FOR ANY DAMAGES ARISING IN ANY WAY OUT % OF THE USE OF THIS SOFTWARE. % hyphenmins: -% for_typesetting: +% typesetting: % left: 2 % right: 2 % changes: See below diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt 2018-07-27 22:09:48.000000000 +0000 @@ -0,0 +1,32 @@ +aA +bB +cC +dD +eE +gG +hH +iI +jJ +kK +lL +mM +nN +oO +pP +rR +sS +tT +uU +vV +yY +ñÑ +āĀ +īĪ +ūŪ +ḍḌ +ḷḶ +ṁṀ +ṃṂ +ṅṄ +ṇṆ +ṭṬ diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt 2018-07-27 22:09:48.000000000 +0000 @@ -0,0 +1,45 @@ +% copyright: Copyright (C) 2018 Wie-Ming Cittānurakkho Bhikkhu +% title: Pāli Hyphenation patterns +% version: 2018-06-29 +% language: +% name: Pāli +% tag: pi +% notice: > +% This file is part of the hyph-utf8 package. +% See http://www.hyphenation.org/tex for more information. +% authors: +% - +% name: Wie-Ming Cittānurakkho Bhikkhu +% contact: wiemingang:gmail.com +% licence: +% name: MIT +% url: https://opensource.org/licenses/MIT +% text: > +% Permission is hereby granted, free of charge, to any person +% obtaining a copy of this software and associated documentation +% files (the “Software”), to deal in the Software without +% restriction, including without limitation the rights to use, +% copy, modify, merge, publish, distribute, sublicense, and/or sell +% copies of the Software, and to permit persons to whom the +% Software is furnished to do so, subject to the following +% conditions: +% +% The above copyright notice and this permission notice shall be +% included in all copies or substantial portions of the Software. +% +% THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +% EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +% OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +% NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +% HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +% WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +% FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +% OTHER DEALINGS IN THE SOFTWARE. +% hyphenmins: +% typesetting: +% left: 1 +% right: 2 +% changes: +% - 2018-06-29 Initial release +% source: Generated manually +% ========================================== diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt --- texlive-lang-2018.20180725/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt 2018-07-27 22:09:48.000000000 +0000 @@ -0,0 +1,89 @@ +.n2h2ā3 +.n2t2 +a1 +2b3b2 +3b2h2 +2b3m2 +3b2r2 +3b2y2 +2c3c2 +3c2h2 +2d3d2 +3d2h2 +2d3m2 +3d2r2 +3d2v2 +e1 +2g3d2h2 +2g3g2 +3g2h2 +2g3r2 +2g3y2 +2h3m2 +2h3v2 +2h3y2 +i1 +3j2h2 +2j3j2 +3k2h2 +2k3k2 +2k3l2 +3k2r2 +3k2v2 +3k2y2 +2l3l2 +2l3y2 +2m3b2 +2m3h2 +2m3m2 +2m3p2 +2m3y2 +2n3d2 +2n1h2 +2n3n2 +2n1t2 +2n3v2 +o1 +3p2h2 +2p3l2 +2p3p2 +2s3m2 +3s2n2 +2s3s2 +2s3t2 +3s2v2 +3s2y2 +3t2h2 +2t3n2 +2t3r2 +2t3t2 +3t2v2 +3t2y2 +u1 +2v3h2 +3v2y2 +2y3h2 +3y2v2 +2y3y2 +2ñ3c2 +2ñ3h2 +2ñ3j2 +2ñ3ñ2 +ā1 +ī1 +ū1 +2ḍ3ḍ2 +3ḷ2h2 +2ṁ3 +2ṁ3n2h2 +2ṃ3 +2ṃ3n2h2 +2ṅ3g2 +2ṅ3k2 +2ṇ3h2 +2ṇ3y2 +2ṇ3ḍ2 +2ṇ3ṇ2 +2ṇ3ṭ2 +3ṭ2h2 +2ṭ3ṭ2 diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsarticle.cls 2018-08-23 21:57:31.000000000 +0000 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsarticle} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsarticle} \newif\ifjsc@needsp@tch diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsbook.cls texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsbook.cls 2018-08-23 21:57:31.000000000 +0000 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsbook} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsbook} \newif\ifjsc@needsp@tch diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjscjkcat.sty 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscjkcat} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] \def\bxjx@pkgname{bxjscjkcat} \newcount\bxjx@cnta \@onlypreamble\bxjx@tmpdo diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjscompat.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjscompat.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjscompat.sty 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjscompat} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] \def\bxac@pkgname{bxjscompat} \let\bxac@engine=n \def\bxac@do#1#2{% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-minimal.def 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-minimal.def} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます \def\DeclareJaTextFontCommand#1#2{% \DeclareRobustCommand#1[1]{% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-modern.def 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-modern.def} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] \input{bxjsja-standard.def} \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi=\z@ \def\encodingdefault{T1}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-pandoc.def 2018-08-23 21:57:31.000000000 +0000 @@ -21,9 +21,15 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-pandoc.def} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] \input{bxjsja-standard.def} \RequirePackage{bxjspandoc} +\@onlypreamble\bxjs@endpreamble@hook +\let\bxjs@endpreamble@hook\@empty +\ifjsWitheTeX + \RequirePackage{etoolbox}[2010/08/21]% v2.0 + \AtEndPreamble{\bxjs@endpreamble@hook} +\fi \@onlypreamble\bxjs@set@dupload@proc \def\bxjs@set@dupload@proc#1{% \expandafter\bxjs@set@dupload@proc@a\csname bxjs@dlp/#1\endcsname} @@ -49,11 +55,13 @@ \def\bxjs@do@dupload@proc#1#2#3{% \csname bxjs@dlp/#2.#1\endcsname{#3}% \@firstoftwo} +\newif\ifbxjs@lang@exists \ifnum0\if x\jsEngine1\fi\if l\jsEngine1\fi>0 \pandocSkipLoadPackage{polyglossia} \bxjs@set@dupload@proc{polyglossia.sty}{% \ClassWarning\bxjs@clsname - {Loading of polyglossia is blocked}} + {Loading of polyglossia is blocked}% + \bxjs@lang@existstrue} \ifx\setmainlanguage\@undefined \newcommand*\setmainlanguage[2][]{} \newcommand*\setotherlanguage[2][]{% @@ -66,14 +74,23 @@ \@for\bxjs@tmpa:={#2}\do{% \setotherlangauge{\bxjs@tmpa}}} \fi +\g@addto@macro\bxjs@endpreamble@hook{% + \ifbxjs@lang@exists\else + \csundef{ver@polyglossia.sty}% + \fi} \else \pandocSkipLoadPackage{babel} \bxjs@set@dupload@proc{babel.sty}{% \ClassWarning\bxjs@clsname - {Loading of babel is blocked}} + {Loading of babel is blocked}% + \bxjs@lang@existstrue} \let\foreignlanguage\@secondoftwo \let\otherlanguage\@gobble \let\endotherlanguage\@empty +\g@addto@macro\bxjs@endpreamble@hook{% + \ifbxjs@lang@exists\else + \csundef{ver@babel.sty}% + \fi} \fi \bxjs@set@dupload@proc{geometry.sty}{% \setpagelayout*{#1}} diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsja-standard.def 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesFile{bxjsja-standard.def} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます \input{bxjsja-minimal.def} \bxjs@simplejasetupfalse diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjspandoc.sty 2018-08-23 21:57:31.000000000 +0000 @@ -21,7 +21,7 @@ %% same distribution. (The sources need not necessarily be %% in the same archive or directory.) \ProvidesPackage{bxjspandoc} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjsp@pkgname{bxjscjkcat} \let\bxjsp@engine=n diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsreport.cls texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsreport.cls 2018-08-23 21:57:31.000000000 +0000 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsreport} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsreport} \newif\ifjsc@needsp@tch diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsslide.cls texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsslide.cls --- texlive-lang-2018.20180725/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2018-07-20 22:07:13.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/bxjscls/bxjsslide.cls 2018-08-23 21:57:31.000000000 +0000 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesClass{bxjsslide} - [2018/07/20 v1.9a BXJS document classes] + [2018/08/20 v1.9b BXJS document classes] %% このファイルは日本語文字を含みます. \def\bxjs@clsname{bxjsslide} \newif\ifjsc@needsp@tch diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/gentombow/gentombow.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/gentombow/gentombow.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/gentombow/gentombow.sty 2018-05-17 20:25:12.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/gentombow/gentombow.sty 2018-08-21 21:52:16.000000000 +0000 @@ -8,7 +8,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{gentombow} - [2018/05/17 v0.9g Generate crop mark 'tombow'] + [2018/08/20 v0.9h Generate crop mark 'tombow'] \def\pxgtmb@pkgname{gentombow} \@namedef{ver@pxgentombow.sty}{}% fake @@ -18,7 +18,7 @@ %% supported engines % case 2: pdfLaTeX etc. % case 1: pLaTeX2e <2018-04-01>+2 or older -% case 0: newer pLaTeX2e +% case 0: pLaTeX2e <2018-05-20> or newer \ifx\pfmtversion\@undefined \@ifpackageloaded{luatexja}{}{\chardef\pxgtmb@errlevel=\tw@} \fi @@ -430,6 +430,7 @@ \pxgtmb@addpapersize[a3]{letter}{8.5in}{11in} \pxgtmb@addpapersize[a3]{legal}{8.5in}{14in} \pxgtmb@addpapersize[a4]{executive}{7.25in}{10.5in} +\pxgtmb@addpapersize[a5]{hagaki}{100mm}{148mm} %% package options part 4 \def\pxgtmb@pdfbox@status{0} @@ -664,6 +665,10 @@ %% patch internal for pdfpages to work with tombow %% (tested on pdfpages 2017/10/31 v0.5l) +%% Note the code is the same as that of pxpdfpages.sty, +%% but reserved here since gentombow.sty can be used on +%% any LaTeX format +%% (cf. pxpdfpages.sty is restricted to (u)pLaTeX) \def\pxgtmb@patch@pdfpages{% \RequirePackage{etoolbox} \patchcmd{\AM@output}{% @@ -679,7 +684,14 @@ } {\PackageInfo{\pxgtmb@pkgname}{Patch for pdfpages applied}} {\PackageWarningNoLine{\pxgtmb@pkgname}{Patch for pdfpages failed}}% - } +} +%% however, if running (u)pLaTeX, use pxpdfpages.sty if available +\ifx\pfmtname\@undefined\else + \IfFileExists{pxpdfpages.sty}{% + \def\pxgtmb@patch@pdfpages{\RequirePackage{pxpdfpages}}% + }{} +\fi +%% do it \AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxgtmb@patch@pdfpages}{}} \endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq.cls texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq.cls --- texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq.cls 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq.cls 2018-08-16 20:48:00.000000000 +0000 @@ -1,4893 +1,5253 @@ -%% Japanese document class based on requirements for Japanese text layout -%% -%% The package is distributed under the BSD 2-Clause License -%% -%% -% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/) -\NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2018/06/17 jlreq] -\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen} -\RequirePackage{jlreq-helpers} - -\newcommand*{\jlreq@undeferr}[1]{\ClassError{jlreq}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}} -% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする -\newcommand*{\jlreq@aftercls@addtodeletecs}[1]{% - \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@undeferr}}% -} -\newcommand*{\jlreq@aftercls@addtodeleteif}[1]{% - \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefif{#1}{\jlreq@undeferr}}% -} -\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeletecs} -\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeleteif} -\AtEndOfClass{% - \jlreq@aftercls@deletecslist - \jlreq@helper@undefcs{\jlreq@aftercls@deletecslist}{\jlreq@undeferr}% - \undef{\jlreq@undeferr}% -} - -% preambleにいるかのスイッチ -\newif\ifjlreq@preamble -\jlreq@preambletrue -\AtBeginDocument{\jlreq@preamblefalse} - -\def\jlreq@saveoriginalcs#1{% - \ifx#1\relax - \ClassError{jlreq}{Trying to save \string#1 but it's not defined, may be a bug}{\@ehc}% - \fi - \expandafter\ifx\csname jlreq@original@\expandafter\@gobble\string#1\endcsname\relax\else - \ClassError{jlreq}{Trying to save \string#1 twice, may be a bug}{\@ehc}% - \fi - \expandafter\let\csname jlreq@original@\expandafter\@gobble\string#1\endcsname=#1 -} -\def\jlreq@useoriginalcs#1{% - \ifcsname jlreq@original@\expandafter\@gobble\string#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi - {\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}% - {#1}% -} - -%. オプションの定義 -% オプション処理の際にしか使わない変数（後でそれを元に別の変数を調整する） -% ものは\jlreq@option@に格納する． -% _とかは@に変換する． -% 引数無しの\DeclareOptionX -\newcommand*{\jlreq@DeclareOption}[2]{% - \DeclareOptionX{#1}{% - \jlreq@ifempty{##1}{}{\ClassError{jlreq}{The option #1 should have no value}{\@ehc}}% - #2% - } -} -\jlreq@aftercls@addtodeletecs{\jlreq@DeclareOption} -% エンジン類 -\jlreq@DeclareOption{uplatex}{\let\jlreq@engine=u} -\jlreq@DeclareOption{platex}{\let\jlreq@engine=p} -\jlreq@DeclareOption{lualatex}{\let\jlreq@engine=l} - -% 文書のタイプ -\newcommand*\jlreq@article@type{article} -\define@choicekey{jlreq.cls}{article_type}{article,report,book}{\renewcommand*{\jlreq@article@type}{#1}} -\jlreq@DeclareOption{article}{\renewcommand*{\jlreq@article@type}{article}} -\jlreq@DeclareOption{report}{\renewcommand*{\jlreq@article@type}{report}} -\jlreq@DeclareOption{book}{\renewcommand*{\jlreq@article@type}{book}} - -%.. 基本版面．まずは紙サイズ． -\def\jlreq@switchpapersize{} -\jlreq@aftercls@addtodeletecs{\jlreq@switchpapersize} -% \jlreq@addpapersize{paper=に指定するもの}{単独オプション名}{横}{縦} - -\def\jlreq@addpapersize#1#2{% - \@ifnextchar[{\jlreq@addpapersize@{#1}{#2}}{\jlreq@addpapersize@@{#1}{#2}} -} -\def\jlreq@addpapersize@#1#2[#3]{% - \edef\@tempa{\unexpanded{\jlreq@addpapersize@@{#1}{#2}}\csexpandonce{jlreq@helper@papersizelist@#3}}% - \@tempa -} -\newcommand*{\jlreq@addpapersize@@}[4]{% - \@for\@tempa:=#1\do{% - \eappto\jlreq@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}}}% - }% - \@for\@tempa:=#2\do{% - \expandafter\jlreq@DeclareOption\expandafter{\@tempa}{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}% - }% -} -\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize} -\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@} -\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@@} -\DeclareOptionX{paper}{ - \edef\jlreq@do{% - \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@switchpapersize}}% - [\unexpanded{% - \jlreq@helper@dividebycomma{#1}% - \ifjlreq@result - \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}% - \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}% - \else - \ClassError{jlreq}{The paper #1 is unknown}{\@ehc}% - \fi - }]% - }% - \jlreq@do -} -% 紙サイズ一覧．b*はJIS B． -\jlreq@addpapersize{a0,A0}{}[a0] -\jlreq@addpapersize{a1,A1}{}[a1] -\jlreq@addpapersize{a2,A2}{}[a2] -\jlreq@addpapersize{a3,A3}{a3paper}[a3] -\jlreq@addpapersize{a4,A4}{a4paper}[a4] -\jlreq@addpapersize{a5,A5}{a5paper}[a5] -\jlreq@addpapersize{a6,A6}{a6paper}[a6] -\jlreq@addpapersize{a7,A7}{}[a7] -\jlreq@addpapersize{a8,A8}{}[a8] -\jlreq@addpapersize{a9,A9}{}[a9] -\jlreq@addpapersize{a10,A10}{}[a10] - -\jlreq@addpapersize{b0,B0}{}[b0] -\jlreq@addpapersize{b1,B1}{}[b1] -\jlreq@addpapersize{b2,B2}{}[b2] -\jlreq@addpapersize{b3,B3}{}[b3] -\jlreq@addpapersize{b4,B4}{b4paper}[b4] -\jlreq@addpapersize{b5,B5}{b5paper}[b5] -\jlreq@addpapersize{b6,B6}{b6paper}[b6] -\jlreq@addpapersize{b7,B7}{}[b7] -\jlreq@addpapersize{b8,B8}{}[b8] -\jlreq@addpapersize{b9,B9}{}[b9] -\jlreq@addpapersize{b10,B10}{}[b10] - -\jlreq@addpapersize{c2,C2}{}[c2] -\jlreq@addpapersize{c3,C3}{}[c3] -\jlreq@addpapersize{c4,C4}{}[c4] -\jlreq@addpapersize{c5,C5}{}[c5] -\jlreq@addpapersize{c6,C6}{}[c6] -\jlreq@addpapersize{c7,C7}{}[c7] -\jlreq@addpapersize{c8,C8}{}[c8] - -\jlreq@addpapersize{a4var}{}[a4var] -\jlreq@addpapersize{b5var}{}[b5var] - -\jlreq@addpapersize{letter}{letterpaper}[letter] -\jlreq@addpapersize{legal}{legalpaper}[legal] -\jlreq@addpapersize{executive}{executivepaper}[executive] -\jlreq@addpapersize{hagaki}{}[hagaki] - - -%.. フォントサイズ，行長，1ページあたりの行数で基本版面のサイズを決める（2.4.1.a） -\newcommand*{\jlreq@option@fontsize}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@fontsize} -\DeclareOptionX{fontsize}{\renewcommand*{\jlreq@option@fontsize}{#1}} -\jlreq@DeclareOption{10pt}{\renewcommand*{\jlreq@option@fontsize}{10pt}} -\jlreq@DeclareOption{11pt}{\renewcommand*{\jlreq@option@fontsize}{11pt}} -\jlreq@DeclareOption{12pt}{\renewcommand*{\jlreq@option@fontsize}{12pt}} -\newcommand*{\jlreq@option@jafontsize}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontsize} -\DeclareOptionX{jafontsize}{\renewcommand*{\jlreq@option@jafontsize}{#1}} -\newcommand*{\jlreq@option@jafontscale}{1} -\DeclareOptionX{jafontscale}{\renewcommand*{\jlreq@option@jafontscale}{#1}} -\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontscale} -%.. 行の長さ -\newcommand*{\jlreq@option@line@length}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@line@length} -\DeclareOptionX{line_length}{\renewcommand*{\jlreq@option@line@length}{#1}} -%.. 1ページあたりの行数 -\newcommand*{\jlreq@option@number@of@lines}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@number@of@lines} -\DeclareOptionX{number_of_lines}{\renewcommand*{\jlreq@option@number@of@lines}{#1}} - -% 地の空き量，のどの空き量で配置位置を決める（2.4.1.b）省略されたら中央配置． -%.. 天 -\newcommand*{\jlreq@option@head@space}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@head@space} -\DeclareOptionX{head_space}{\renewcommand*{\jlreq@option@head@space}{#1}} - -%.. 地 -\newcommand*{\jlreq@option@foot@space}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@foot@space} -\DeclareOptionX{foot_space}{\renewcommand*{\jlreq@option@foot@space}{#1}} -%.. のど -\newcommand*{\jlreq@option@gutter}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@gutter} -\DeclareOptionX{gutter}{\renewcommand*{\jlreq@option@gutter}{#1}} -%.. 小口 -\newcommand*{\jlreq@option@fore@edge}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@fore@edge} -\DeclareOptionX{fore_edge}{\renewcommand*{\jlreq@option@fore@edge}{#1}} - -%.. 柱とノンブル -\newcommand*{\jlreq@option@headfoot@verticalpos}{} -\jlreq@aftercls@addtodeletecs{\jlreq@option@headfoot@verticalpos} -% 本文とヘッダ/フッタの間の空き -\DeclareOptionX{headfoot_verticalposition}{\renewcommand*{\jlreq@option@headfoot@verticalpos}{#1}} -\newcommand*{\jlreq@headfoot@sidemargin}{0pt} -% 柱やノンブルの左右の空き -\DeclareOptionX{headfoot_sidemargin}{\renewcommand*{\jlreq@headfoot@sidemargin}{#1}} - -%.. 段間 -\newcommand*{\jlreq@option@column@gap}{2zw} -\jlreq@aftercls@addtodeletecs{\jlreq@option@column@gap} -\DeclareOptionX{column_gap}{\renewcommand*{\jlreq@option@column@gap}{#1}} - -%.. 行送り，指定無しの場合は文字サイズの1.7倍とする．（1.5から2倍が好ましい：2.4.2.d 注3） -\newcommand*{\jlreq@option@baselineskip}{17zw/10} -\jlreq@aftercls@addtodeletecs{\jlreq@option@baselineskip} -\DeclareOptionX{baselineskip}{\def\jlreq@option@baselineskip{#1}} -\DeclareOptionX{linegap}{\def\jlreq@option@baselineskip{1zw + #1}} - -%.. 組み方系 -% 行頭に括弧が来たときの配置：3.1.5 -% 段落頭指定_折り返し行頭指定 で与える． -\newcommand*{\jlreq@open@bracket@pos}{zenkaku_tentsuki} -\define@choicekey{jlreq.cls}{open_bracket_pos}{zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\renewcommand*{\jlreq@open@bracket@pos}{#1}} -% ぶら下げ組みをするか：3.8.2 注1 -\newif\ifjlreq@burasage\jlreq@burasagefalse -\jlreq@DeclareOption{hanging_punctuation}{\jlreq@burasagetrue} - -%.. 注 -% 傍注のタイプ -\newcommand*{\jlreq@option@sidenote@length}{0pt} -\jlreq@aftercls@addtodeletecs{\jlreq@option@sidenote@length} -\DeclareOptionX{sidenote_length}{\renewcommand*{\jlreq@option@sidenote@length}{#1}} - -%.. もろもろ -\newif\if@restonecol\@restonecolfalse -\newif\if@titlepage\@titlepagefalse -\newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepageかnotitlepageかが指定された -\newif\if@landscape\@landscapefalse -\newif\if@tate \@tatefalse -\jlreq@DeclareOption{landscape}{\@landscapetrue} -\jlreq@DeclareOption{tombo}{\ClassWarningNoLine{jlreq}{The option `tombo' is not supported by jlreq class. Please use the jlreq-trimmarks package}} -\jlreq@DeclareOption{tombow}{\ClassWarningNoLine{jlreq}{The option `tombow' is not supported by jlreq class. Please use the jlreq-trimmarks package}} -\jlreq@DeclareOption{mentuke}{\ClassWarningNoLine{jlreq}{The option `mentuke' is not supported by jlreq class. Please use the jlreq-trimmarks package}} -\jlreq@DeclareOption{tate}{\@tatetrue} - -\newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % onesideかtwosideが指定された -\jlreq@aftercls@addtodeleteif{\ifjlreq@option@twoside} -\jlreq@DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue} -\jlreq@DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue} -\jlreq@DeclareOption{onecolumn}{\@twocolumnfalse} -\jlreq@DeclareOption{twocolumn}{\@twocolumntrue} -\jlreq@DeclareOption{titlepage}{\jlreq@option@titlepagetrue\@titlepagetrue} -\jlreq@DeclareOption{notitlepage}{\jlreq@option@titlepagetrue\@titlepagefalse} -\jlreq@DeclareOption{draft}{\setlength\overfullrule{5pt}} -\jlreq@DeclareOption{final}{\setlength\overfullrule{0pt}} -\newif\if@openright -\newif\ifjlreq@option@open \jlreq@option@openfalse % openrightかopenanyが指定された -\jlreq@aftercls@addtodeleteif{\ifjlreq@option@open} -\jlreq@DeclareOption{openright}{\@openrighttrue\jlreq@option@opentrue} -\jlreq@DeclareOption{openany}{\@openrightfalse\jlreq@option@opentrue} -\jlreq@DeclareOption{leqno}{\input{leqno.clo}} -\jlreq@DeclareOption{fleqn}{\input{fleqn.clo}} - -\newcommand*{\jlreq@note}[1]{} -\jlreq@DeclareOption{jlreq_notes}{\renewcommand*{\jlreq@note}[1]{\message{^^JJLReq note: ##1^^J}}} - -\ExecuteOptionsX{article_type=article,paper=a4,open_bracket_pos=zenkaku_tentsuki,onecolumn,final} -% \@removeelementを一旦置き換えてから\ProcessOptionsXを実行する -\let\jlreq@temporary@original@@removeelement=\@removeelement -\let\@removeelement=\jlreq@helper@removeelement -\ProcessOptionsX\relax -\let\@removeelement=\jlreq@temporary@original@@removeelement -\let\jlreq@temporary@original@@removeelement=\@undefined - -\ifjlreq@option@titlepage\else - \ifthenelse{\equal{\jlreq@article@type}{article}}{\@titlepagefalse}{\@titlepagetrue} -\fi -\ifjlreq@option@open\else - \ifthenelse{\equal{\jlreq@article@type}{book}}{\@openrighttrue}{\@openrightfalse} -\fi -% articleではopenrightは効かない． -\ifthenelse{\equal{\jlreq@article@type}{article}}{% - \if@openright - \ClassWarningNoLine{jlreq}{The option `openright' is ignored in article} - \@openrightfalse - \fi -}{} -\ifjlreq@option@twoside\else - \ifthenelse{\equal{\jlreq@article@type}{book}}{\@twosidetrue}{\@twosidefalse} -\fi - -\def\jlreq@jlreqsetup@keyvallist{} -\def\jlreq@jlreqsetup@finally{} -\newcommand{\jlreqsetup}[1]{% - \begingroup - \edef\jlreq@do{\unexpanded{\jlreq@parsekeyval[jlreqsetup]}{\expandonce{\jlreq@jlreqsetup@keyvallist}}}% - \expandafter\endgroup - \jlreq@do{#1}% - \jlreq@jlreqsetup@finally -} -% \jlreqsetupの項目に加えるマクロ．\jlreq@jlreqsetup@add{key}{action}とするとkeyに対して定義できる． -% action内ではvalが#1として取得できる．（従ってaction内でマクロを定義する際には##1を使う必要がある．） -\newcommand{\jlreq@jlreqsetup@add}[1]{% - \@ifnextchar[{\jlreq@jlreqsetup@add@{#1}}{\jlreq@jlreqsetup@add@@{#1}}% -} -\long\def\jlreq@jlreqsetup@add@#1[#2]#3{% - \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}[#2]{#3}}}% -} -\long\def\jlreq@jlreqsetup@add@@#1#2{% - \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}{#2}}}% -} -% \jlreqsetupの最後に必ず実行される処理を入れる． -\newcommand\jlreq@jlreqsetup@addtofinally[1]{\eappto\jlreq@jlreqsetup@finally{\unexpanded{#1}}} -\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add} -\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@} -\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@@} -\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@addtofinally} -\@onlypreamble\jlreqsetup - -% エンジンの設定 -\ifx\jlreq@engine\@undefined - \jlreq@helper@guessengine - \let\jlreq@engine=\jlreq@result -\fi - - -% 必要パッケージのロード -\ifx l\jlreq@engine - \RequirePackage{luatexja} - \directlua{jlreq = {}} -\fi - -% (u)pLaTeXの場合ここで初めて\epTeXinputencodingが発行されるので， -% これ以前には和文は使えない． -\ifx l\jlreq@engine\else - \epTeXinputencoding utf8 - \def\zw{zw}\def\zh{zh} - % http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=1508&parent=8435 - \if@tate\AtEndPreamble{\par}\fi -\fi -\if@tate - \AtBeginDocument{\tate\message{《縦組モード》}\adjustbaseline} -\fi - -% \jlreq@gol(Gyo Okuri Length), \jlreq@mol (Moji Okuri Length)を定義 -\let\jlreq@gol=\zh -\let\jlreq@mol=\zw - -%. helper2（エンジン依存系：和文文字を含むものもこれ以降） -% #1のboxを今の真ん中に配置する． -\def\jlreq@box@putcenter#1{% - \begingroup - \jlreq@tempdima=\dimexpr(\ht#1 - \dp#1)/2\relax - \setbox\jlreq@tempboxa=\hbox{阿}% - \edef\jlreq@do{% - \noexpand\lower\the\dimexpr(\jlreq@tempdima - (\ht\jlreq@tempboxa - \dp\jlreq@tempboxa)/2)\relax\unexpanded{\box#1}% - }% - \expandafter\endgroup - \jlreq@do -} - -% #1の先頭が文字か -\long\def\jlreq@ifletter#1{% - \jlreq@iffirsttoken{#1}{ }{\@secondoftwo}{% - \expandafter\expandafter\expandafter\jlreq@helper@ifletter\jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@ - }% -} - -\long\def\jlreq@helper@ifletter#1{% - \ifnum - 0% - \ifcat 阿\noexpand #11\fi - \ifcat あ\noexpand #11\fi - \ifcat （\noexpand #11\fi - \ifcat A\noexpand #11\fi - \ifcat 1\noexpand #11\fi - >0 - \expandafter\@firstoftwo\else\expandafter\@secondoftwo - \fi -} - - -% 組方向を判定 -% \jlreq@if(y|t)(dir|box)を定義する． -\ifx l\jlreq@engine\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{ - \def\jlreq@ifydir{\ifnum\ltjgetparameter{direction}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@iftdir{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@ifybox#1{\ifnum\ltjgetparameter{boxdir}{#1}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@iftbox#1{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -}{ - \def\jlreq@ifydir{\ifydir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@iftdir{\iftdir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@ifybox#1{\ifybox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} - \def\jlreq@iftbox#1{\iftbox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -} - -\ifx l\jlreq@engine - \newcommand*{\jlreq@getpostbreakpenalty}[1]{\ltjgetparameter{postbreakpenalty}{#1}} -\else - \newcommand*{\jlreq@getpostbreakpenalty}[1]{\postbreakpenalty#1} -\fi - -% 現在行の残りを得る． -\ifx l\jlreq@engine - % 以下のコードはおかしい． - \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{% - \dimexpr\zposx{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp - \@totalleftmargin - - \ifodd\jlreq@currentpage - \oddsidemargin - \else - \evensidemargin - \fi - \iftombow - 1in\fi - - 1in - \hoffset\relax - } -\else - \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{% - \dimexpr - \jlreq@ifydir{% - \zposx{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp - \hoffset - \ifodd\jlreq@currentpage - - \oddsidemargin - \else - - \evensidemargin - \fi - }{% - \ifdim\pdfpagewidth=0pt - \paperheight - \else - \pdfpageheight - \fi - - \topmargin - \headheight - \headsep - \voffset - - \zposy{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp - }% - \iftombow - 1in\fi - - \@totalleftmargin - 1in - \relax - } -\fi -\newcommand*{\jlreq@calc@current@linewidth}{% - \dimexpr\jlreq@calc@current@linewidth@onecolumn - \if@twocolumn - \ifdim\jlreq@calc@current@linewidth@onecolumn<\dimexpr\linewidth+\columnsep\relax\else - - \linewidth - \columnsep - \fi - \fi - \relax -} - -\newdimen\jlreq@current@linewidth -\newdimen\jlreq@rest@linewidth -% この命令以降，次にこの命令を実行する前まで\jlreq@current@linewidth/\jlreq@rest@linewidthで -% この行の行頭からの長さ/残りの長さが取得できる -\newcommand*{\jlreq@savepos@for@rest@linewidth}{% - \jlreq@setcurrentpage - \global\advance\jlreq@zref@reference@count by 1\relax - \zsavepos{jlreq@rest@width.pos.\the\jlreq@zref@reference@count}% - \global\jlreq@current@linewidth=\jlreq@calc@current@linewidth - \global\jlreq@rest@linewidth=\dimexpr\linewidth - \jlreq@current@linewidth\relax - \edef\jlreq@savepos@iflabelundefined{\noexpand\zref@ifrefundefined{jlreq@rest@width.pos.\the\jlreq@zref@reference@count}}% -} - -\ifx l\jlreq@engine - \newcommand*{\lastnodechar}{\directlua{luatexja.pltx_composite_last_node_char()}}% undocumentedな機能を使っている -\fi - -% #1と#2の間に入るjmglue（(x)kanjiskipも）を\jlreq@resultskipに入れる -\ifx l\jlreq@engine - \newcommand*{\jlreq@calc@jfmglue}[2]{% - \begingroup - \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}% - \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}% - \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\dimexpr\wd\jlreq@tempboxb - \wd\jlreq@tempboxa\relax\noexpand\relax}% - \jlreq@do - \directlua{ - local width = 0 - local stretch = 0 - local shrink = 0 - local n = tex.box["jlreq@tempboxb"].head - while n do - % すべてのglueの和を計算する． - if n.id == node.id("glue") then - width = width + n.width - stretch = stretch + n.stretch - shrink = shrink + n.shrink - end - n = n.next - end - tex.setglue("jlreq@tempskipa",width,stretch,shrink) - }% - % TeXで計測した物と一致していなければTeXでの方を信じる - \ifdim\jlreq@resultskip=\jlreq@tempskipa - \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\jlreq@tempskipa\relax}% - \fi - \expandafter\endgroup - \jlreq@do - } -\else - \newcommand*{\jlreq@calc@jfmglue}[2]{% - \begingroup - \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}% - \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}% - \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\dimexpr\wd\jlreq@tempboxb - \wd\jlreq@tempboxa\relax\noexpand\relax}% - \expandafter\endgroup - \jlreq@do - } -\fi - -\newcount\jlreq@lastnodechar -% \jlreq@fixjfm<次の文字>の形で使う． -% jlreq@lastnodecharに入っている値と次のトークン（\futureletで得る）の間に入るJFMグルー等を挿入する -\newcommand*{\jlreq@fixjfm}{% - \begingroup - \ifnum\jlreq@lastnodechar>-1 - \def\jlreq@do{\futurelet\jlreq@nextchar\jlreq@insertjfm}% - \else\def\jlreq@do{}\fi - \expandafter\endgroup - \jlreq@do -} -% \jlreq@nextcharと\jlreq@lastnodecharの間のJFMグルーを挿入 -\def\jlreq@insertjfm{% - \ifnum\jlreq@getpostbreakpenalty{\jlreq@lastnodechar}=0\else\penalty\jlreq@getpostbreakpenalty{\jlreq@lastnodechar}\fi - \begingroup - \def\jlreq@do{}% - \jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}% - \expandafter\jlreq@ifletter\expandafter{\jlreq@tempa}{% - \jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{\jlreq@tempa}% -% \message{fixjfm Insert: \the\jlreq@resultskip}% - \edef\jlreq@do{% - \noexpand\hskip\the\jlreq@resultskip\space - \noexpand\inhibitglue - }% - }{}% - \expandafter\endgroup - \jlreq@do -} - -\ifx l\jlreq@engine - \newcommand*{\jlreq@divide}[2]{% - \jlreq@resultdimen=\directlua{tex.print(tostring(\strip@pt\dimexpr #1\relax/\strip@pt\dimexpr #2\relax) .. "pt ")}% - } -\else - \let\jlreq@divide=\jlreq@helper@divide -\fi - -%. 基本設定 -\providecommand*{\jlreq@kanjiskip}{0pt plus 0.25\zw minus 0pt} -\providecommand*{\jlreq@xkanjiskip}{0.25\zw plus 0.25\zw minus 0.125\zw} -\ifx l\jlreq@engine - \ltjsetparameter{kanjiskip=\jlreq@kanjiskip} - \ltjsetparameter{xkanjiskip=\jlreq@xkanjiskip} -\else - \kanjiskip=\jlreq@kanjiskip - \xkanjiskip=\jlreq@xkanjiskip -\fi - -% 文字クラスのリスト（必要なものだけ） -% 開き括弧（文字クラス1） -\edef\jlreq@charlist@openingbrackets{（〔［｛〈《「『【‘“\ifx p\jlreq@engine\else ｟〘〖«〝\fi} -% 閉じ括弧（文字クラス2） -\edef\jlreq@charlist@closingbrackets{）〕］｝〉》」』】’”\ifx p\jlreq@engine\else｠〙〗»〟\fi} -% ハイフン（文字クラス3） -\edef\jlreq@charlist@hyphens{‐〜\ifx p\jlreq@engine\else ゠–\fi} -% 区切り約物（文字クラス4） -\edef\jlreq@charlist@dividingpunctuationmarks{！？\ifx p\jlreq@engine\else ‼⁇⁈⁉\fi} -% 中点類（文字クラス5） -\edef\jlreq@charlist@middlenodes{・：；} -% 句点類（文字クラス6） -\edef\jlreq@charlist@fullstops{。．} -% 読点類（文字クラス7） -\edef\jlreq@charlist@commas{、，} -% 分離禁止文字（文字クラス8） -\edef\jlreq@charlist@inseparablecharacters{—…‥\ifx p\jlreq@engine\else 〳〴〵\fi} -% 繰返し記号（文字クラス9） -\edef\jlreq@charlist@iterationmarks{ヽヾゝゞ々\ifx p\jlreq@engine\else 〻\fi} -% 長音記号（文字クラス10） -\edef\jlreq@charlist@prolongedsoundmark{ー} -% 小書きの仮名（文字クラス11） -\edef\jlreq@charlist@smallkana{ぁぃぅぇぉァィゥェォっゃゅょゎッャュョヮヵヶ\ifx p\jlreq@engine\else ゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ\fi}%ㇷ゚ -% 前置省略記号（文字クラス12） -\edef\jlreq@charlist@prefixedabbreviations{￥＄￡＃\ifx p\jlreq@engine\else €№\fi} -% 平仮名（文字クラス15） -\edef\jlreq@charlist@hiragana{あいうえおかがきぎくぐけげこごさざしじすずせぜそぞただちぢつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもやゆよらりるれろわゐゑをん\ifx p\jlreq@engine\else ゔ\fi}% か゚き゚く゚け゚こ゚ -% 片仮名（文字クラス16） -\edef\jlreq@charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq@engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚ - -\ifx l\jlreq@engine - \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\ltjsetparameter{postbreakpenalty={`#1,#2}}} - \newcommand*{\jlreq@setprebreakpenalty@}[2]{\ltjsetparameter{prebreakpenalty={`#1,#2}}} - \newcommand*{\jlreq@addjaxspmode@}[2]{% - \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}% - \jlreq@switch{#2}{ - {pre}{% - \ifnum\jlreq@tempcnta=2 - \ltjsetparameter{jaxspmode={`#1,allow}}% - \else\ifnum\jlreq@tempcnta=0 - \ltjsetparameter{jaxspmode={`#1,preonly}}% - \fi\fi - } - {post}{% - \ifnum\jlreq@tempcnta=1 - \ltjsetparameter{jaxspmode={`#1,allow}}% - \else\ifnum\jlreq@tempcnta=0 - \ltjsetparameter{jaxspmode={`#1,postonly}}% - \fi\fi - } - }% - } - \newcommand*{\jlreq@deljaxspmode@}[2]{% - \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}% - \jlreq@switch{#2}{ - {pre}{% - \ifnum\jlreq@tempcnta=2 - \ltjsetparameter{jaxspmode={`#1,postonly}}% - \else\ifnum\jlreq@tempcnta=1 - \ltjsetparameter{jaxspmode={`#1,inhibit}}% - \fi\fi - } - {post}{% - \ifnum\jlreq@tempcnta=3 - \ltjsetparameter{jaxspmode={`#1,preonly}}% - \else\ifnum\jlreq@tempcnta=2 - \ltjsetparameter{jaxspmode={`#1,inhibit}}% - \fi\fi - } - }% - } -\else - \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\postbreakpenalty`#1=#2} - \newcommand*{\jlreq@setprebreakpenalty@}[2]{\prebreakpenalty`#1=#2} - \newcommand*{\jlreq@addjaxspmode@}[2]{% - \jlreq@tempcnta=\inhibitxspcode`#1 - \jlreq@switch{#2}{ - {pre}{% - \ifnum\jlreq@tempcnta=1 - \inhibitxspcode`#1=3 - \else\ifnum\jlreq@tempcnta=0 - \inhibitxspcode`#1=2 - \fi\fi - } - {post}{% - \ifnum\jlreq@tempcnta=2 - \inhibitxspcode`#1=3 - \else\ifnum\jlreq@tempcnta=0 - \inhibitxspcode`#1=1 - \fi\fi - } - }% - } - \newcommand*{\jlreq@deljaxspmode@}[2]{% - \jlreq@tempcnta=\inhibitxspcode`#1 - \jlreq@switch{#2}{ - {pre}{% - \ifnum\jlreq@tempcnta=3 - \inhibitxspcode`#1=1 - \else\ifnum\jlreq@tempcnta=2 - \inhibitxspcode`#1=0 - \fi\fi - } - {post}{% - \ifnum\jlreq@tempcnta=3 - \inhibitxspcode`#1=2 - \else\ifnum\jlreq@tempcnta=1 - \inhibitxspcode`#1=0 - \fi\fi - } - }% - } -\fi -% #1{...}{#3}を...が#2のリストに対して適用． -\newcommand*\jlreq@iterateapply[3]{% - \edef\jlreq@tempa{#2}% - \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@tempa\do{% - \expandafter#1\expandafter{\@tempa}{#3}% - }% -} -\def\jlreq@setpostbreakpenalty{\jlreq@iterateapply{\jlreq@setpostbreakpenalty@}} -\def\jlreq@setprebreakpenalty{\jlreq@iterateapply{\jlreq@setprebreakpenalty@}} -\def\jlreq@addjaxspmode{\jlreq@iterateapply{\jlreq@addjaxspmode@}} -\def\jlreq@deljaxspmode{\jlreq@iterateapply{\jlreq@deljaxspmode@}} - -\jlreq@aftercls@addtodeletecs{\jlreq@iterateapply} -\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty} -\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty@} -\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty} -\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty@} -\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode} -\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode@} -\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode} -\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode@} - -% 行末禁則 -\jlreq@setpostbreakpenalty{\jlreq@charlist@openingbrackets}{10000} -\jlreq@setpostbreakpenalty{\jlreq@charlist@prefixedabbreviations}{10000} - -% 行頭禁則 -\jlreq@setprebreakpenalty{\jlreq@charlist@closingbrackets}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@hyphens}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@dividingpunctuationmarks}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@middlenodes}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@fullstops}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@commas}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@iterationmarks}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@prolongedsoundmark}{10000} -\jlreq@setprebreakpenalty{\jlreq@charlist@smallkana}{10000} - -% xkanjiskip -\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{pre} -\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{post} -\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{pre} -\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{post} -\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{pre} -\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{post} -\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{pre} -\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{post} -\jlreq@addjaxspmode{\jlreq@charlist@katakana}{pre} -\jlreq@addjaxspmode{\jlreq@charlist@katakana}{post} -\jlreq@addjaxspmode{\jlreq@charlist@dividingpunctuationmarks}{post} - -% 分割禁止（分離禁止文字は特定の並びで分割禁止だが，とりあえず一括で禁止しておく．） -\jlreq@setprebreakpenalty{\jlreq@charlist@inseparablecharacters}{10000} -% ￥100とか70％とか…… - -%.. 文字範囲 -\ifx u\jlreq@engine - % \kcatcodeの設定 - \def\jlreq@setkcatcode#1#2{\@for\@tempa:=#1\do{\kcatcode"\@tempa=#2\relax}} - \jlreq@aftercls@addtodeletecs{\jlreq@setkcatcode} - % LuaTeX-jaのデフォルトのままに近い設定をする - % 範囲1＆8 - \jlreq@setkcatcode{80}{15} % Latin-1 Supplement，どうしよう…… - \jlreq@setkcatcode{100,180,250,2B0,300,1E00}{15} - % 範囲2 - \jlreq@setkcatcode{370,400,1F00}{18} - % 範囲3 - \jlreq@setkcatcode{2000,2070,20A0,20D0,2100,2150,2190,2200,2300,2400,2500,2580,25A0,2600,2700,2900,2980,2B00}{18} - % 範囲4 - \jlreq@setkcatcode{500,530,590,600,700,750,780,7C0,800,840,8A0,900,980,A00,A80,B00,B80,C00,C80,D00,D80,E00,E80,F00,1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1C80,1CC0,1CD0,1D00,1D80,1DC0,2400,2440,27C0,27F0,2800,2A00,2C00,4DC0,A4D0,A500,A640,A6A0,A700,A720,A800,A840,A880,A8E0,A900,A930,A960,A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,FB00,FB50,FE00,FE20,FE70,10000,10080,10100,10140,10190,101D0,10280,102A0,102E0,10300,10330,10350,10380,103A0,10400,10450,10480,104B0,10500,10530,10600,10800,10840,10860,10880,108E0,10900,10920,10980,109A0,10A00,10A60,10A80,10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,11000,11080,110D0,11100,11150,11180,111E0,11200,11280,112B0,11300,11400,11480,11580,11600,11660,11680,11700,118A0,11AC0,11C00,11C70,12000,12400,12480,13000,14400,16800,16A40,16AD0,16B00,16F00,16FE0,17000,18800,1B000,1BC00,1BCA0,1D000,1D100,1D200,1D300,1D360,1D400,1D800,1E000,1E800,1E900,1EE00,1F000,1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,1F700,1F780,1F800,1F900,E000}{15} - % 範囲5（Variation Selectors SupplementはLuaTeX-jaではE01F0--E01EFまで範囲5，他は範囲6） - \jlreq@setkcatcode{D800,DB80,DC00,E0000,F0000,100000}{15} - % 範囲6 - \jlreq@setkcatcode{3040,30A0,31F0}{17} % Hiragana,Katakana,Katakana Phonetic Extensions - \jlreq@setkcatcode{2460,3000,3200,3300,FE10,FE30,FE50,E0100}{18} % Enclosed Alphanumerics,CJK Symbols and Punctuation,Enclosed CJK Letters and Months,CJK Compatibility,Vertical Forms,CJK Compatibility Forms,Small Form Variants,Variation Selectors Supplement - \jlreq@setkcatcode{2E80,3190,3400,4E00,F900,20000}{16} - % 範囲7 - \jlreq@setkcatcode{A000,A490}{18} % Yi Syllables,Yi Radicals - \jlreq@setkcatcode{1100,3130,AC00,D7B0}{19} % Hangul Jamo,Hangul Compatibility Jamo,Hangul Syllables,Hangul Jamo Extended-B - \jlreq@setkcatcode{2F00,2FF0,3100,31A0,31C0,A830}{16} -\fi - -% フォントサイズを設定 -\newdimen\jlreq@fontsize -\newdimen\jlreq@jafontsize -\ifx l\jlreq@engine - % Q,zw,zhが正しく扱われるようになる．\dimexprつきに展開される． - \def\jlreq@expand@optionfontsize#1{% - \dimexpr\directlua{ - local act = string.char(92) - local s = [[#1]] - s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax") - tex.print(s) - }\relax - }% -\else - \def\jlreq@expand@optionfontsize#1{\dimexpr#1\relax} -\fi -\jlreq@aftercls@addtodeletecs{\jlreq@expand@optionfontsize} -\ifx\jlreq@option@fontsize\@empty - \ifx\jlreq@option@jafontsize\@empty - \jlreq@fontsize=10pt - \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize - \else - \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} - \jlreq@divide{\jlreq@jafontsize}{\jlreq@option@jafontscale pt} - \jlreq@fontsize=\jlreq@resultdimen - \fi -\else - \setlength{\jlreq@fontsize}{\jlreq@expand@optionfontsize{\jlreq@option@fontsize}} - \ifx\jlreq@option@jafontsize\@empty - \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize - \else - \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} - \fi -\fi -%. フォント -\RequirePackage{lmodern} - -%.. 古いフォントコマンド -\DeclareOldFontCommand{\jlreq@oldfontcommand@mc}{\normalfont\mcfamily}{\mathmc} -\DeclareOldFontCommand{\jlreq@oldfontcommand@gt}{\normalfont\gtfamily}{\mathgt} -\DeclareOldFontCommand{\jlreq@oldfontcommand@rm}{\normalfont\rmfamily}{\mathrm} -\DeclareOldFontCommand{\jlreq@oldfontcommand@sf}{\normalfont\sffamily}{\mathsf} -\DeclareOldFontCommand{\jlreq@oldfontcommand@tt}{\normalfont\ttfamily}{\mathtt} -\DeclareOldFontCommand{\jlreq@oldfontcommand@bf}{\normalfont\bfseries}{\mathbf} -\DeclareOldFontCommand{\jlreq@oldfontcommand@it}{\normalfont\itshape}{\mathit} -\DeclareOldFontCommand{\jlreq@oldfontcommand@sl}{\normalfont\slshape}{\@nomath\sl} -\DeclareOldFontCommand{\jlreq@oldfontcommand@sc}{\normalfont\scshape}{\@nomath\sc} -\newcommand*{\jlreq@oldfontcommand@enable}{% - \let\mc=\jlreq@oldfontcommand@mc - \let\gt=\jlreq@oldfontcommand@gt - \let\rm=\jlreq@oldfontcommand@rm - \let\sf=\jlreq@oldfontcommand@sf - \let\tt=\jlreq@oldfontcommand@tt - \let\bf=\jlreq@oldfontcommand@bf - \let\it=\jlreq@oldfontcommand@it - \let\sl=\jlreq@oldfontcommand@sl - \let\sc=\jlreq@oldfontcommand@sc -} -\newcommand*{\jlreq@oldfontcommand@disable}{% - \let\mc=\@undefined - \let\gt=\@undefined - \let\rm=\@undefined - \let\sf=\@undefined - \let\tt=\@undefined - \let\bf=\@undefined - \let\it=\@undefined - \let\sl=\@undefined - \let\sc=\@undefined -} - -\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} -\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} - -%.. 和文 -% ダミー -\def\@ptsize{0} -% JFMに関連する設定 -\ifx l\jlreq@engine - % この値は後でjfm-jlreq内で読む - \directlua{jlreq.open_bracket_pos = [[\jlreq@open@bracket@pos]]} - \ifjlreq@burasage\directlua{jlreq.burasage = true}\else\directlua{jlreq.burasage = false}\fi - % \item後の行頭括弧のために仕込み． - \jlreq@saveoriginalcs{\list} - \jlreq@saveoriginalcs{\endlist} - \PushPostHook{par}{\jlreq@parhook@atbeginlist} - \pretocmd{\list}{\def\jlreq@parhook@atbeginlist{\ltjfakeparbegin}}{}{} - \apptocmd{\endlist}{\def\jlreq@parhook@atbeginlist{}}{}{} - \def\jlreq@parhook@atbeginlist{} -\else - % 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処． - % 行頭括弧に対して\inhibitglueを入れたりする命令を作る - % \jlreq@charlist@openingbracketsの各括弧に対して，\ifx\jlreq@nextchar 「1\fiみたいなのが並んだのを作る - \def\jlreq@tempa{} - \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}} - \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark - % JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる． - \ifthenelse{\equal{\jlreq@open@bracket@pos}{nibu_tentsuki}}{ - \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi} - }{% zenkakunibu_nibu,zenkaku_tentsuki - \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi} - } - % source special対策 - \def\jlreq@openbracket@hook{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@@\else\expandafter\jlreq@openbracket@hook@\fi} - \def\jlreq@openbracket@hook@@#1#2{#1{#2}\futurelet\jlreq@nextchar\jlreq@openbracket@hook} - \def\jlreq@jfmname@prefix{} - \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix} - \ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi - \ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{\edef\jlreq@jfmname@prefix{\jlreq@jfmname@prefix z}}{} - \ifx u\jlreq@engine\edef\jlreq@jfmname@prefix{u\jlreq@jfmname@prefix}\fi - \edef\jlreq@jfmname{\jlreq@jfmname@prefix jlreq} % JFMの名前 - \edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前 - \AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}} -\fi - -% 行頭の括弧は \jlreq@open@bracket@before@space \inhibitglue 「みたいにする． -\ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{ - \def\jlreq@open@bracket@before@space{\hskip\glueexpr-.5\zw\relax} -}{ - \def\jlreq@open@bracket@before@space{} -} - -\ifx l\jlreq@engine - \RequirePackage{luatexja-adjust} - \ltjenableadjust[lineend=extended,priority=true] - \ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=10}} - \ltjsetparameter{shrink_priority={kanjiskip=0,xkanjiskip=-30}} -\fi - -\ifx p\jlreq@engine - \def\jlreq@yokokanjiencoding{JY1} - \def\jlreq@tatekanjiencoding{JT1} -\fi -\ifx u\jlreq@engine - \def\jlreq@yokokanjiencoding{JY2} - \def\jlreq@tatekanjiencoding{JT2} -\fi -\ifx l\jlreq@engine - \def\jlreq@yokokanjiencoding{JY3} - \def\jlreq@tatekanjiencoding{JT3} -\fi -\expandafter\let\csname \jlreq@yokokanjiencoding/mc/m/n/10\endcsname\relax -\expandafter\let\csname \jlreq@tatekanjiencoding/mc/m/n/10\endcsname\relax -\jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize} -\edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} -\jlreq@aftercls@addtodeletecs{\jlreq@jafontscale} -\ifx l\jlreq@engine - \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreq;script=latn;-kern}{} - \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreq;script=latn;-kern}{} - \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreqv;script=latn;-kern}{} - \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreqv;script=latn;-kern}{} -\else - \DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname}{} - \DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg}{} - \DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname-v}{} - \DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg-v}{} -\fi -\@for\jlreq@encoding:=\jlreq@yokokanjiencoding,\jlreq@tatekanjiencoding\do{ - \@for\jlreq@shape:=n,it,sl,sc\do{ - \@for\jlreq@series:=m,b,bx,sb,c\do{ - \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ - \DeclareFontShape{\jlreq@encoding}{gt}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} - } - } - \@for\jlreq@series:=bx,b,sb\do{ - \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} - } - \@for\jlreq@series:=m,c\do{ - \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ - \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*mc/m/n}{} - } - } - } -} - -% 和文ファミリと欧文ファミリの連動 -\DeclareRobustCommand\rmfamily{% - \not@math@alphabet\rmfamily\mathrm - \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} -\DeclareRobustCommand\sffamily{% - \not@math@alphabet\sffamily\mathsf - \romanfamily\sfdefault\kanjifamily\gtdefault\selectfont} -\DeclareRobustCommand\ttfamily{% - \not@math@alphabet\ttfamily\mathtt - \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} - -% 数式フォント設定 -\ifx l\jlreq@engine\else - \DeclareSymbolFont{mincho}{\jlreq@yokokanjiencoding}{mc}{m}{n} - \DeclareSymbolFontAlphabet{\mathmc}{mincho} - \SetSymbolFont{mincho}{bold}{\jlreq@yokokanjiencoding}{gt}{m}{n} - \jfam\symmincho - \DeclareMathAlphabet{\mathgt}{\jlreq@yokokanjiencoding}{gt}{m}{n} -\fi -\AtBeginDocument{% - \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}% - \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}% -} - -% 和文間隔 -\DeclareRobustCommand*\　{\futurelet\jlreq@nextchar\jlreq@zenkakuspace@ignorespaces} -% 後続の空白を無視する処理 -\edef\jlreq@zenkakuspace@ignorespaces{% - \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@zenkakuspace@ignorespaces@\else\expandafter\jlreq@zenkakuspace@main\fi}% -} -\expandafter\def\expandafter\jlreq@zenkakuspace@ignorespaces@\space{\　} -\def\jlreq@tempa{} -\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifnum\lastnodechar=`#1 1\fi}\jlreq@do}} -\expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark -\edef\@tempa{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 } -\expandafter\DeclareRobustCommand\expandafter*\expandafter\jlreq@zenkakuspace@main\expandafter{\@tempa - \hskip 1\zw\hbox{}% - \jlreq@lastnodechar=`　 - \expandafter\jlreq@fixjfm - \else\expandafter　\fi -} -\ifx l\jlreq@engine - { - \catcode`　=\active - \global\let　=\jlreq@zenkakuspace@main - } - \AtBeginDocument{\catcode`　=\active} -\fi - -% \jaspace -\DeclareRobustCommand*{\jaspace}[1]{% - \ifcsname jlreq@jaspace@#1\endcsname\csname jlreq@jaspace@#1\endcsname - \else\ClassError{jlreq}{unknown jaspace: #1}{\@ehc}\fi -} -\def\jlreq@jaspace@zenkaku{\hskip\glueexpr 1\zw\relax} -\def\jlreq@jaspace@nibu{\hskip\glueexpr .5\zw\relax} -\def\jlreq@jaspace@shibu{\hskip\glueexpr .25\zw\relax} - -% 区切り約物．\？ みたいな命令を作る．直後の空きが自動で入る． -% \？*とすると文中の？として扱われる． -\def\jlreq@tempa{} -\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar #11\fi}\jlreq@do}} -\expandafter\jlreq@do\jlreq@charlist@closingbrackets\jlreq@endmark -\edef\jlreq@dividingpunctuationmarkscommand{% - \noexpand\ifnum 0\expandonce{\jlreq@tempa}>0 \unexpanded{\expandafter\ignorespaces\else\expandafter\　\fi}% -} -\def\jlreq@do#1{% - \jlreq@ifendmark{#1}{}{ - \expandafter\DeclareRobustCommand\expandafter*\csname #1\endcsname{% - \jlreq@ifstar - {\hskip .25\zw #1\hskip .25\zw\ignorespaces}% - {#1\futurelet\jlreq@nextchar\jlreq@dividingpunctuationmarkscommand}% - } - \jlreq@do - } -} -\expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark - -% \baselineskipの計算 -% いったん文字サイズを変更（(u)platexの際にzh/zwをきちんとするため） -\@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@fontsize}% -\newdimen\jlreq@baselineskip -\ifx l\jlreq@engine - \setlength{\jlreq@baselineskip}{% - \dimexpr\directlua{ - local act = string.char(92) - local s = [[\jlreq@option@baselineskip]] - s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw") - tex.print(s) - }\relax - }% -\else - \setlength{\jlreq@baselineskip}{\dimexpr\jlreq@option@baselineskip\relax} -\fi -\ifdim\jlreq@fontsize>\jlreq@baselineskip - \ClassError{jlreq}{The baselineskip is less than fontsize}{\@ehc}% -\fi -\ifthenelse{\lengthtest{\jlreq@baselineskip<1.5\zw} \OR \lengthtest{\jlreq@baselineskip>2\zw}}{ - \jlreq@note{行間は二分以上全角以下が望ましい (2.4.2.d 注3)．} -}{} - -\emergencystretch 3\jlreq@gol - -%.. 文字サイズ変更 -\def\jlreq@setfontsizehook{} -\jlreq@saveoriginalcs{\set@fontsize} -\apptocmd{\set@fontsize}{\expandafter\def\expandafter\size@update\expandafter{\size@update\jlreq@setfontsizehook}}{}{} -\appto\jlreq@setfontsizehook{\ifdim\parindent>0pt \setlength{\parindent}{1\zw}\fi} -\ifx l\jlreq@engine - \@tempskipa=\ltjgetparameter{kanjiskip} - \ifdim\@tempskipa=\maxdimen\else - \appto\jlreq@setfontsizehook{% - \ltj@setpar@global - \ltjsetkanjiskip\jlreq@kanjiskip - \@tempskipa=\ltjgetparameter{xkanjiskip}% - \ifdim\@tempskipa>0pt - \ltjsetxkanjiskip\jlreq@xkanjiskip - \fi - } - \fi -\else - \appto\jlreq@setfontsizehook{% - \kanjiskip=\jlreq@kanjiskip - \ifdim\xkanjiskip>0pt - \xkanjiskip=\jlreq@xkanjiskip - \fi - } -\fi - -% \jafontsize -\ifdim\jlreq@fontsize=\jlreq@jafontsize - \let\jafontsize=\fontsize -\else - \def\@tempa#1{ - \DeclareRobustCommand*{\jafontsize}[2]{% - \begingroup - \jlreq@iffloat{##1}{% - \edef\jlreq@do{\noexpand\fontsize{\strip@pt\dimexpr#1\dimexpr##1pt\relax\relax}}% - }{% - \edef\jlreq@do{\noexpand\fontsize{\the\dimexpr#1\dimexpr##1\relax\relax}}% - }% - \expandafter\endgroup - \jlreq@do{##2}% - } - } - \jlreq@divide{\jlreq@fontsize}{\jlreq@jafontsize} - \edef\jlreq@do{\noexpand\@tempa{\strip@pt\jlreq@resultdimen}} - \jlreq@do -\fi - -\renewcommand{\normalsize}{% - \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@baselineskip}% - \abovedisplayskip 1.1\jlreq@fontsize \@plus .3\jlreq@fontsize \@minus .4\jlreq@fontsize - \abovedisplayshortskip \z@ \@plus .3\jlreq@fontsize - \belowdisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize - \belowdisplayshortskip \belowdisplayskip - \let\@listi\@listI} - -\if@tate\tate\fi % ここで発行しておく -\mcfamily\selectfont\normalsize -\setbox\jlreq@tempboxa\hbox{阿} -\setlength\Cht{\ht\jlreq@tempboxa} -\setlength\Cdp{\dp\jlreq@tempboxa} -\setlength\Cwd{\wd\jlreq@tempboxa} -\setlength\Cvs{\baselineskip} -\setlength\Chs{\wd\jlreq@tempboxa} - -% 4.1.3.a -% 2.5.2 \baselineskipは一定の方がよい？ -% \@listiは再定義しないようにした．（\normalsizeと共用でJLReq通りだと思う．） -\newcommand{\footnotesize}{% - \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e - \abovedisplayskip .6\jlreq@fontsize \@plus.2\jlreq@fontsize \@minus.4\jlreq@fontsize - \abovedisplayshortskip \z@ \@plus.1\jlreq@fontsize - \belowdisplayshortskip .3\jlreq@fontsize \@plus.1\jlreq@fontsize \@minus.2\jlreq@fontsize - \belowdisplayskip \abovedisplayskip} -% tsize10.cloの引数を，そのまま\jlreq@fontsize/\jlreq@baselineskipでスケーリングしているだけ． -\newcommand{\small}{% - % jsarticleのもの - \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@baselineskip/17\relax}% - \abovedisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize - \abovedisplayshortskip \z@ \@plus.3\jlreq@fontsize - \belowdisplayshortskip \abovedisplayshortskip - \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@baselineskip/17\relax}} -\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@baselineskip/17\relax}} -\newcommand{\large}{\@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@baselineskip}} -\newcommand{\Large}{\@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@baselineskip/17\relax}} -\newcommand{\LARGE}{\@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@baselineskip/17\relax}} -\newcommand{\huge}{\@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@baselineskip/17\relax}} -\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@baselineskip/17\relax}} - -%. plextから一部拝借 -% オプションも*もない\rensuji（コピペ） -\DeclareRobustCommand{\jlreq@rensuji}[1]{% - \ifvmode\leavevmode\fi - \jlreq@ifydir{\hbox{#1}}{% - \hskip 0pt plus 0.25\zw minus 0pt % \rensujiskipは固定値 - \setbox\jlreq@tempboxa=\hbox{\yoko#1}% - \@tempdima=\dimexpr\ht\jlreq@tempboxa+\dp\jlreq@tempboxa\relax - \vrule\@width\z@ \@height.5\@tempdima \@depth.5\@tempdima - \hbox to 1\zw{\yoko\hss#1\hss}% - \hskip 0pt plus 0.25\zw minus 0pt -}} -\def\jlreq@Kanji#1{\expandafter\kansuji\csname c@#1\endcsname} - -% このあたりはtarticleと同じ -\setlength\lineskip{.1\zh} -\setlength\normallineskip{.1\zh} -\renewcommand{\baselinestretch}{} -\setlength\parskip{0\p@ \@plus \p@} -\setlength\parindent{1\zw} -\@lowpenalty 51 -\@medpenalty 151 -\@highpenalty 301 - -% 変数定義（他にも散らばっているけど） -% 罫線の太さ（4.4.3.c 注1） -\newdimen\jlreq@omotekeiwidth -\jlreq@omotekeiwidth=0.12mm -\newdimen\jlreq@chuubusokeiwidth -\jlreq@chuubusokeiwidth=0.25mm -\newdimen\jlreq@urakeiwidth -\jlreq@urakeiwidth=0.4mm -% 脚注のインデント -\newdimen\jlreq@footnoteindent - -%\RequirePackage{jlreq-debug} - -%. ページレイアウト -% landscapeの場合縦横をひっくり返す -\if@landscape - \setlength\@tempdima {\paperheight} - \setlength\paperheight{\paperwidth} - \setlength\paperwidth {\@tempdima} -\fi - -% \pdfpagewidthとか設定 -\ifx l\jlreq@engine - \let\jlreq@pagewidth=\pagewidth - \let\jlreq@pageheight=\pageheight -\else - \let\jlreq@pagewidth=\pdfpagewidth - \let\jlreq@pageheight=\pdfpageheight -\fi -\setlength{\jlreq@pagewidth}{\paperwidth} -\setlength{\jlreq@pageheight}{\paperheight} -\iftombow - \addtolength{\jlreq@pagewidth}{2in} - \addtolength{\jlreq@pageheight}{2in} -\fi - - -\ifx l\jlreq@engine - \def\jlreq@expand@speciallength#1{% - % zhやzwを\zhや\zwにする． - \directlua{ - local act = string.char(92) - local s = [[#1]] - s = s:gsub("zw",act .. "zw"):gsub("zh",act .. "zh") - tex.print(s) - }% - } -\else - \def\jlreq@expand@speciallength#1{#1} -\fi -\def\jlreq@speciallength#1{\dimexpr\jlreq@expand@speciallength{#1}\relax} - -%.. 二段組み用パラメータ -\setlength{\columnsep}{\jlreq@speciallength{\jlreq@option@column@gap}} -\setlength{\columnseprule}{0pt} - -%.. 傍注（4.2.7） -\begingroup - \footnotesize - \setlength{\jlreq@tempdima}{\jlreq@speciallength{\jlreq@option@sidenote@length}} - \jlreq@tempdimb=1\zw - \divide\jlreq@tempdima\jlreq@tempdimb - \multiply\jlreq@tempdima\jlreq@tempdimb - \edef\jlreq@do{ - \noexpand\setlength{\noexpand\marginparwidth}{\the\jlreq@tempdima} - \noexpand\setlength{\noexpand\marginparpush}{\the\dimexpr 0.5\zw\relax} % 同上：4.2.7.g - } - \expandafter\endgroup -\jlreq@do -\ifdim\marginparwidth>0pt - \setlength{\marginparsep}{2\zw} % フォントサイズ×2（4.2.7：特に問題に～e） -\else - \setlength{\marginparsep}{0pt} -\fi - -\ifdim\marginparwidth>0pt - \ifnum 0\ifdim\marginparwidth>25\zw 1\fi\ifdim\marginparwidth<15\zw 1\fi>0 - \jlreq@note{並列注の字詰め方向の長さ（行長）は，15字から20字くらいである．ケースによっては25字程度にする場合もある (4.2.7)．} - \fi -\fi -% 縦書きの時は脚注に固定 -% (TODO: 頭注） -\if@tate\@mparswitchfalse\fi - -\setlength{\topskip}{1\zw} % フォントサイズと一致させる -\ifx\jlreq@option@headfoot@verticalpos\@empty - \if@tate\def\jlreq@option@headfoot@verticalpos{1zw} - \else\def\jlreq@option@headfoot@verticalpos{2zw}\fi -\fi -\setlength{\headsep}{\jlreq@speciallength{\jlreq@option@headfoot@verticalpos}} -\ifdim\headsep<1\zw\relax\jlreq@note{基本版面との上下方向の最低の空き量を，基本版面の文字サイズの全角アキとする (26.1.a)．}\fi -\setlength{\headheight}{1\zw} - -% \textwidthと\textheightのデフォルト値は縦横ともに0.75倍（調整が入る）． -%.. \textwidth：文字送り方向の行長 -% 二段の場合は最初の段の頭から次の段の後まで -% 一度\textwidthに一行の長さの文字数を入れる（段組の場合でも） -\newif\ifjlreq@determine@kihonhanmen@warning@first -\jlreq@determine@kihonhanmen@warning@firsttrue -\def\jlreq@determine@kihonhanmen@warning{ - \ifjlreq@determine@kihonhanmen@warning@first - \jlreq@note{基本版面は，a. サイズの決定 b. 仕上りサイズに対する基本版面の配置位置の決定 という手順で行う (2.4.1)．} - \jlreq@determine@kihonhanmen@warning@firstfalse - \fi -} -\jlreq@aftercls@addtodeletecs{\jlreq@determine@kihonhanmen@warning} -\jlreq@aftercls@addtodeleteif{\ifjlreq@determine@kihonhanmen@warning@first} -\@tempdima=1\zw -\ifx\jlreq@option@line@length\@empty - \if@tate - \ifnum 0\ifx\jlreq@option@head@space\@empty 1\fi\ifx\jlreq@option@foot@space\@empty 1\fi>0 - \setlength{\textwidth}{0.75\paperheight} - \divide\textwidth\@tempdima\multiply\textwidth\@tempdima - \else - \jlreq@determine@kihonhanmen@warning - \setlength{\textwidth}{\dimexpr\paperheight - \jlreq@option@head@space - \jlreq@option@foot@space \relax} - \fi - \else - \ifnum 0\ifx\jlreq@option@gutter\@empty 1\fi\ifx\jlreq@option@fore@edge\@empty 1\fi>0 - \setlength{\textwidth}{0.75\paperwidth} - \divide\textwidth\@tempdima\multiply\textwidth\@tempdima - \else - \jlreq@determine@kihonhanmen@warning - \setlength{\textwidth}{\dimexpr\paperwidth - \jlreq@option@gutter - \jlreq@option@fore@edge\relax} - \fi - \fi - \if@twocolumn - \addtolength{\textwidth}{\dimexpr-2\marginparwidth - 2\marginparsep\relax} - \setlength{\textwidth}{\dimexpr(\textwidth - \columnsep)/2\relax} - \else - \addtolength{\textwidth}{\dimexpr-\marginparwidth - \marginparsep\relax} - \fi -\else - \setlength{\textwidth}{\jlreq@speciallength{\jlreq@option@line@length}} - \divide\textwidth\@tempdima - \if@tate - \ifnum\number\textwidth>52 - \jlreq@note{一行の長さは52文字以下が望ましい (2.4.2.c 注2)．} - \fi - \else - \ifnum\number\textwidth>40 - \jlreq@note{一行の長さは40文字以下が望ましい (2.4.2.c 注2)．} - \fi - \fi - \multiply\textwidth\@tempdima -\fi -\if@twocolumn - \setlength{\textwidth}{\dimexpr2\textwidth + \columnsep\relax} -\fi - - -%.. \textheight：行送り方向の長さ -% 一番上（直後に\topskip由来が入る）から最終行のベースラインまでの長さ． -% \topskipが十分ある時は先頭行のベースラインから最終行のベースライン＋\topskip -\def\jlreq@adjusttextheight{ - \addtolength{\textheight}{-\topskip} - \divide\textheight\baselineskip \multiply\textheight\baselineskip - \addtolength{\textheight}{\topskip} -} -\jlreq@aftercls@addtodeletecs{\jlreq@adjusttextheight} -\ifx\jlreq@option@number@of@lines\@empty - \if@tate - \ifnum 0\ifx\jlreq@option@gutter\@empty 1\fi\ifx\jlreq@option@fore@edge\@empty 1\fi>0 - \setlength{\textheight}{0.75\paperwidth} - \jlreq@adjusttextheight - \else - \jlreq@determine@kihonhanmen@warning - \setlength{\textheight}{\dimexpr\paperwidth - \jlreq@option@gutter - \jlreq@option@fore@edge + \topskip - 1\zw\relax} - \fi - \else - \ifnum 0\ifx\jlreq@option@head@space\@empty 1\fi\ifx\jlreq@option@foot@space\@empty 1\fi>0 - \setlength{\textheight}{0.75\paperheight} - \jlreq@adjusttextheight - \else - \jlreq@determine@kihonhanmen@warning - \setlength{\textheight}{\dimexpr\paperheight + 2\topskip - 1\zh - \Cht - \jlreq@option@head@space - \jlreq@option@foot@space\relax} - \fi - \fi -\else - \setlength{\textheight}{\dimexpr\numexpr\jlreq@option@number@of@lines\relax\baselineskip - \baselineskip + \topskip\relax} -\fi - -%.. 横 -\def\jlreq@setsidemargin@by@gutter#1{ - \if@tate - \setlength{\evensidemargin}{#1} - \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight - \evensidemargin + \topskip - \Cht\relax} - \addtolength{\evensidemargin}{\Cdp} - \else - \setlength{\oddsidemargin}{#1} - \if@twocolumn - \addtolength{\oddsidemargin}{\dimexpr\marginparsep + \marginparwidth\relax} - \fi - \setlength{\evensidemargin}{\dimexpr\paperwidth - \textwidth - \oddsidemargin\relax} - \fi -} -\def\jlreq@setsidemargin@by@fore@edge#1{ - \jlreq@setsidemargin@by@gutter{#1} - \@tempdima=\evensidemargin - \evensidemargin=\oddsidemargin - \oddsidemargin=\@tempdima - \ifjlreq@determine@kihonhanmen@warning@first - \jlreq@note{基本版面の配置はのどの空き量を指定する (2.4.1.b)．} - \fi -} - -\ifx\jlreq@option@gutter\@empty - \ifx\jlreq@option@fore@edge\@empty - % 中央配置 - \if@tate - \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight + \topskip\relax} - \else - \if@twocolumn - \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textwidth\relax} - \else - \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textwidth - \marginparsep - \marginparwidth\relax} - \fi - \fi - \setlength{\oddsidemargin}{.5\oddsidemargin} - \ifnum0\if@twocolumn1\fi\if@tate1\fi>0 - \setlength{\evensidemargin}{\oddsidemargin} - \else - \setlength{\evensidemargin}{\dimexpr\oddsidemargin + \marginparsep + \marginparwidth\relax} - \fi - \else - \jlreq@setsidemargin@by@fore@edge{\jlreq@speciallength{\jlreq@option@fore@edge}} - \fi -\else - \jlreq@setsidemargin@by@gutter{\jlreq@speciallength{\jlreq@option@gutter}} - \ifx\jlreq@option@fore@edge\@empty\else - \ifjlreq@determine@kihonhanmen@warning@first\else - \ClassWarningNoLine{jlreq}{fore_edge is ignored} - \fi - \fi -\fi -\addtolength{\oddsidemargin}{-1in} -\addtolength{\evensidemargin}{-1in} - -%.. 縦 -% \topmarginに全体の頭からテキストの頭までの長さを入れる -% 天の値からtopmarginを設定する -\def\jlreq@settopmarginbyhead#1{ - \if@tate - \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in\relax} - \if@twocolumn - \addtolength{\topmargin}{\dimexpr\marginparwidth + \marginparsep\relax} - \fi - \jlreq@note{縦組の場合は地の空き量を指定する (2.4.1.b)．} - \else - \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in - \topskip + \Cht\relax} - \fi -} -\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyhead} -% 地の値から -\def\jlreq@settopmarginbyfoot#1{ - \if@tate - \setlength{\topmargin}{\dimexpr\paperheight - \textwidth - \headsep - \headheight - 1in - #1 - \marginparsep - \marginparwidth\relax} - \else - \jlreq@note{横組の場合は天の空き量を指定する (2.4.1.b)．} - \setlength{\topmargin}{\dimexpr\paperheight - \textheight + \topskip - 1\zh - \headsep - \headheight - 1in - #1\relax} - \fi -} -\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyfoot} -\ifx\jlreq@option@head@space\@empty - \ifx\jlreq@option@foot@space\@empty - \if@tate - \if@twocolumn - \jlreq@settopmarginbyfoot{\dimexpr(\paperheight - \textwidth - 2\marginparwidth - 2\marginparsep)/2\relax} - \else - \jlreq@settopmarginbyfoot{\dimexpr(\paperheight - \textwidth - \marginparwidth - \marginparsep)/2\relax} - \fi - \else - \jlreq@settopmarginbyhead{\dimexpr(\paperheight - (\textheight - \topskip + 1\zh))/2\relax} - \fi - \else - \jlreq@settopmarginbyfoot{\jlreq@speciallength{\jlreq@option@foot@space}} - \fi -\else - \ifx\jlreq@option@foot@space\@empty - \jlreq@settopmarginbyhead{\jlreq@speciallength{\jlreq@option@head@space}} - \else - % 両方指定されていたら，縦書きは地を，横書きは天を使う - \if@tate - \jlreq@settopmarginbyfoot{\jlreq@speciallength{\jlreq@option@foot@space}} - \ifx\jlreq@option@line@length\@empty\else - \ClassWarningNoLine{jlreq}{head_space is ignored} - \fi - \else - \jlreq@settopmarginbyhead{\jlreq@speciallength{\jlreq@option@head@space}} - \ifx\jlreq@option@number@of@lines\@empty\else - \ClassWarningNoLine{jlreq}{foot_space is ignored} - \fi - \fi - \fi -\fi - -%.. 下 -\setlength{\footskip}{\dimexpr\headsep + 1\zw\relax} -% \maxdepth + \topskip = フォントサイズ×1.5（だってさ） -\setlength{\maxdepth}{\dimexpr1.5\zw - \topskip\relax} - -%. 見出し関係 (4.1) -% \clear***page -\newcommand*{\cleartooddpage}{% - \clearpage - \ifodd\c@page\else - \hbox{}% - \newpage - \if@twocolumn\hbox{}\newpage\fi - \fi -} -\newcommand*{\cleartoevenpage}{% - \clearpage - \ifodd\c@page - \hbox{}% - \newpage - \if@twocolumn\hbox{}\newpage\fi - \fi -} - -% 扉見出しと別行見出しについては，\ -> \jlreq@headingcs@csname -> 本体と -% 二段構えで展開されるようにする．一度の展開で\parが出るのを防ぐため． -% 一度展開を\longなしマクロに渡されると破綻するので．（そういうパッケージが存在する．） - -% jlreq@heading@maketoc@<命令名>が\tableofcontents用の出力をするために呼び出される． -% #1=*または空（見出し命令に*がついていたかで分岐），#2=ラベル，#3=running head -% デフォルトでは\<命令名>markと\addcontentslineが必要ならば呼ばれる． - -% 見出しの直前に実行される -\newcommand*{\jlreq@hook@beforeheadings}[1]{} -% 見出し名一覧を格納する -\def\jlreq@heading@allheadings{} - -% 目次を出力する命令\l@<命令名>を作る命令を作る．{1 = 命令名}{2 = レベル}{3 = ラベルのフォーマット} -% 結果は\jlreq@resultに入る． -\def\jlreq@heading@make@l@#1#2#3{% - \@ifundefined{l@#1}{% - % 長さは適当に計測する - \begingroup - % ちょっと大きめで計測しておく - \csname c@#1\endcsname=9 - \setbox\jlreq@tempboxa=\hbox{#3}% - \jlreq@tempdima=\wd\jlreq@tempboxa - \csname c@#1\endcsname=26 - \setbox\jlreq@tempboxa=\hbox{#3}% - \ifdim\jlreq@tempdima<\wd\jlreq@tempboxa - \jlreq@tempdima=\wd\jlreq@tempboxa - \fi - % \numexprは四捨五入 - \jlreq@tempdimb=\dimexpr\the\numexpr\jlreq@tempdima/\dimexpr 1\zw\relax + 2\relax\zw\relax - \edef\jlreq@do{% - \unexpanded{\def\jlreq@result}{% - \noexpand\def\expandonce{\csname l@#1\endcsname}{\unexpanded{\@dottedtocline{#2}{0\zw}}{\the\jlreq@tempdimb}}% - }% - }% - \expandafter\endgroup - \jlreq@do - }{\def\jlreq@result{}}% -} - -\def\jlreq@heading@make@maketoc#1#2{% - % 目次への出力をするマクロ．外部に切り出しておく． - \@ifundefined{jlreq@heading@maketoc@#1}{% - % {1 = *}{2 = ラベル}{3 = running head} - \expandafter\def\csname jlreq@heading@maketoc@#1\endcsname##1##2##3{% - \ifnum0\jlreq@ifempty{##1}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0\else - \csname #1mark\endcsname{##3}% - \addcontentsline{toc}{#1}{\protect\numberline{##2}##3}% - \fi - }% - }{}% -} -%.. 中/半扉見出し -% addcontentslineに渡すやつ：番号出すのと出さないの -\newcommand{\DeclareTobiraHeading}[3]{% - \def\jlreq@do{\@removeelement{#1}}% - \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% - \appto{\jlreq@heading@allheadings}{,#1}% - \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% - \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% - \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewTobiraHeading}% - \@ifundefined{c@#1}{\newcounter{#1}}{}% - \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% - \jlreq@heading@make@maketoc{#1}{#2}% - \begingroup - \let\jlreq@contents@label@format=\@undefined - \let\jlreq@format=\@undefined - \edef\jlreq@label@format{\expandonce{\csname the#1\endcsname}}% - \def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}% - \def\jlreq@pagestyle{empty}% - \jlreq@parsekeyval[DeclareTobiraHeading:#1]{ - {label_format}{\def\jlreq@label@format{##1}} - {format}{\def\jlreq@format####1####2{##1}} - {pagestyle}{\def\jlreq@pagestyle{##1}} - {type}[han,naka]{% - \jlreq@switch{##1}{ - {han}{\def\jlreq@heading@clearpage{\clearpage}} - {naka}{\def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}} - }% - } - }{#3}% - \def\jlreq@do{}% - \ifx\jlreq@format\@undefined - \def\jlreq@format##1##2{##1##2}% - \fi - \edef\jlreq@formatwlabel{\noexpand\jlreq@format{\expandonce{\jlreq@label@format}}}% - \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% - \eappto\jlreq@do{\expandonce{\jlreq@result}}% - \edef\jlreq@do{% - \expandonce{\jlreq@do}% - \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}[####1]####2{% - \unexpanded{\ifnum#2>\c@secnumdepth\else}% - \unexpanded{\refstepcounter{#1}}% - \noexpand\fi - \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{}{\expandonce{\jlreq@label@format}}{####1}% - \unexpanded{\ifnum#2>\c@secnumdepth\relax}% - \expandonce{\jlreq@format{}{##1}}% - \noexpand\else - \expandafter\expandonce\expandafter{\jlreq@formatwlabel{##2}}% - \noexpand\fi - \noexpand\@afterheading - \expandonce{\jlreq@heading@clearpage}% - \unexpanded{\if@restonecol\twocolumn\fi}% - }% - \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}####1{% - \expandonce{\jlreq@format{}{##1}}% - \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{*}{\expandonce{\jlreq@label@format}}{####1}% - \noexpand\@afterheading - \expandonce{\jlreq@heading@clearpage}% - \unexpanded{\if@restonecol\twocolumn\fi}% - }% - \noexpand\def\expandonce{\csname jlreq@headingcs@#1\endcsname}{% - % 改丁．これでよいのかな． - \unexpanded{\if@twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\cleartooddpage}% - \ifx\jlreq@pagestyle\@empty\else\noexpand\thispagestyle{\expandonce{\jlreq@pagestyle}}\fi - \noexpand\secdef{\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}}{\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}}}% - \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq@headingcs@#1\endcsname}}% - }% - \expandafter\endgroup - \jlreq@do -} - -\newcommand{\NewTobiraHeading}[3]{% - \expandafter\@ifdefinable\csname #1\endcsname{\DeclareTobiraHeading{#1}{#2}{#3}}% -} -\newcommand{\RenewTobiraHeading}[3]{% - \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareTobiraHeading{#1}{#2}{#3}}% -} -\newcommand{\ProvideTobiraHeading}[3]{% - \@ifundefined{#1}{\DeclareTobiraHeading{#1}{#2}{#3}}{}% -} - -%.. 別行見出し -% \jlreq@BlockHeading@start：別行見出しを出力する命令． -% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = フォーマット関連}{5 = 全体フォーマット}*{見出し}[副題] -% スペース関連={配置:lcr（左中央右）}{字下げ（寸法）}{字上げ（寸法）}{前空き}{後空き}{行取りの行数}{空か*か，偶数ページでも改ページを許可するならば空} -% 前/後空きはprefixにa:/s:/r:が入る．r:は空きがその値そのものになる．a:/s:は行取りに加えて入る．a:で指定された空きはページ行頭では入らない -% 後空きの時はs:は指定できない． -% フォーマット関連： -% フォーマット関連={ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット（ラベル無し）}{副題フォーマット}{副題フォーマット（ラベル無し）}{見出し全体のフォーマット} -% 見出しそのものは「全体フォーマット」に従い出力される．パラメータトークン#1を含み，#1=見出し本体：スペース関連と上の「見出し全体のフォーマット」に基づいて整形される． -% 見出し全体のフォーマット内では#1=ラベル，#2=見出し文字列，#3=副題，それぞれ各々のフォーマットに基づき整形される． -% ラベルフォーマットでは#1=カウンタ名，見出し文字列フォーマットでは#1=見出し文字列，副題フォーマットでは#1=副題 -% ラベルのみのフォーマットは目次に使われる． -\newcommand{\jlreq@BlockHeading@start}[5]{% - \edef\jlreq@BlockHeading@start@format{\unexpanded{#4}}% この二つは\parを含むかもしれないので引数渡しはしない（後の\@ifstarで詰まる） - \edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#5}}% - \jlreq@BlockHeading@start@{#1}{#2}{#3}% -} -% {1 = 命令}{2 = レベル}{3 = スペース関連} -\newcommand{\jlreq@BlockHeading@start@}[3]{% - \@ifstar{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{}}}% -} -% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出し} -\long\def\jlreq@BlockHeading@start@@#1#2#3#4[#5]#6{% - \jlreq@ifnextchar[{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}[]}% -} - -% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題] -\long\def\jlreq@BlockHeading@start@@@#1#2#3#4#5#6[#7]{% - \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\expandonce{\jlreq@BlockHeading@start@format}}{\expandonce{\jlreq@BlockHeading@start@totalformat}}}% - \jlreq@do{#4}{#5}{#6}{#7}% -} - -% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = フォーマット群}{5 = 全フォーマット}{6 = *}{7 = running head}{8 = 見出し}{9 = 副題} -\long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8#9{% - \edef\jlreq@tempa##1##2##3##4##5##6##7{% - \unexpanded{\jlreq@BlockHeading@start@makeoutput{#1}{#2}}{{##1}{##2}{##3}}\unexpanded{{#4}{#6}{#7}{#8}{#9}}% - \unexpanded{\def\jlreq@tempb}{{##4}{##5}{##6}{##7}}% 縦方向空き - }% - \jlreq@tempa#3% - \global\advance\jlreq@BlockHeading@spaces@current@count by 1 - \appto\jlreq@BlockHeading@spaces@current@sequence{_#1}% - \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% - \expandonce{\jlreq@resultb}% - }% - \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% - \expandonce{\jlreq@tempb}% - }% - \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@format@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% - \unexpanded{#5}% - }% - \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% - \expandonce{\jlreq@resulta}% - }% - \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{}% - \ifx\jlreq@BlockHeading@spaces@headingslist\@empty - \expandafter\jlreq@BlockHeading@spaces@outputwospace - \expandafter\ignorespaces - \else - \expandafter\jlreq@BlockHeading@start@afterheading - \fi -} - -\def\jlreq@BlockHeading@start@afterheading{\futurelet\jlreq@nextchar\jlreq@BlockHeading@start@afterheading@} -\edef\jlreq@BlockHeading@start@afterheading@{% - \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@BlockHeading@start@afterheading@@}% - \unexpanded{\else\expandafter\jlreq@BlockHeading@start@afterheading@@@\fi}% -} -% スペースを読み飛ばす -\expandafter\def\expandafter\jlreq@BlockHeading@start@afterheading@@\space{\jlreq@BlockHeading@start@afterheading} -\def\jlreq@BlockHeading@start@afterheading@@@{% - \def\jlreq@do{\jlreq@BlockHeading@spaces@output}% - \@for\@tempa:=\jlreq@BlockHeading@allheadings\do{% - \expandafter\ifx\csname\@tempa\endcsname\jlreq@nextchar\def\jlreq@do{}\fi - }% - % \jlreq@BlockHeading@HeadingSpaces@ignoretokens内のものは特別扱いする - \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@BlockHeading@HeadingSpaces@ignoretokens\do{% - \expandafter\ifx\@tempa\jlreq@nextchar - \def\jlreq@do{\jlreq@BlockHeading@start@afterheading@saveafter@cs}% - \fi - }% - \jlreq@do -} - -% コントロールシークエンスを保存 -\def\jlreq@BlockHeading@start@afterheading@saveafter@cs#1{% - \csgappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{#1}% - \jlreq@BlockHeading@start@afterheading@saveafter@option -} -% オプションがあれば保存 -\def\jlreq@BlockHeading@start@afterheading@saveafter@option{% - \@ifnextchar[{\jlreq@BlockHeading@start@afterheading@saveafter@option@}{\jlreq@BlockHeading@start@afterheading@saveafter@arguments}% -} -\def\jlreq@BlockHeading@start@afterheading@saveafter@option@[#1]{% - \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{[#1]}}% - \jlreq@BlockHeading@start@afterheading@saveafter@arguments -} -% 引数を保存し続けるループ -\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments{% - \jlreq@ifnextchar\bgroup{\jlreq@BlockHeading@start@afterheading@saveafter@arguments@}{\jlreq@BlockHeading@start@afterheading}% -} -\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments@#1{% - \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{{#1}}}% - \jlreq@BlockHeading@start@afterheading@saveafter@arguments -} - -% 特別扱いしたいマクロを並べる -\def\jlreq@BlockHeading@HeadingSpaces@ignoretokens{\label} - -% \jlreq@resultaにaux吐き出しとかを入れて，\jlreq@resultbに出力を入れる（縦方向調整なし） -% {1 = 命令}{2 = レベル}{3 = スペース関連（横方向のみ）}{4 = フォーマット群}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題} -\long\def\jlreq@BlockHeading@start@makeoutput#1#2#3#4#5#6#7#8{% - \begingroup - \ifnum0\jlreq@ifempty{#5}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0 - \def\jlreq@tempc{*}% - \else - \def\jlreq@tempc{}% - \fi - \long\def\jlreq@tempa##1##2##3##4##5##6##7{% - \long\def\jlreq@tempa{##1}% 素のラベルのフォーマットを取り出す - \edef\jlreq@tempb{\unexpanded{{##2}{##3}{##4}{##5}{##6}{##7}}{\expandonce{\jlreq@tempc}}}% 残り - }% - \jlreq@tempa#4% - \expandafter\jlreq@BlockHeading@start@makeoutput@@\jlreq@tempb{#7}{#8}% - \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@\unexpanded{#3}{\expandonce{\jlreq@result}}}% - \jlreq@do - \edef\jlreq@do{% - \unexpanded{\def\jlreq@resulta}{% - \expandafter\if\jlreq@tempc *\else\unexpanded{\refstepcounter{#1}}\fi - \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{\unexpanded{#5}}{\expandonce{\jlreq@tempa}}{\unexpanded{#6}}% - }% - \unexpanded{\def\jlreq@resultb}{% - \expandonce{\jlreq@result}% - }% - }% - \expandafter\endgroup - \jlreq@do -} - -% {1 = 配置(clr)}{2 = 字下げ}{3 = 字上げ}{4 = 出力} -\long\def\jlreq@BlockHeading@start@makeoutput@#1#2#3#4{% - \edef\jlreq@result{% - \noexpand\noindent - \jlreq@ifempty{#2}{}{\unexpanded{\hskip #2}}% - \noexpand\vbox{% - \noexpand\noindent - \ifx#1c\noexpand\centering\fi - \ifx#1r\noexpand\raggedleft\fi - \jlreq@ifempty{#2}{}{\unexpanded{\hsize=\dimexpr\hsize - #2\relax}}% - \jlreq@ifempty{#3}{}{\unexpanded{\hsize=\dimexpr\hsize - #3\relax}}% - \unexpanded{#4}}% - }% -} - -% {1 = ラベルフォーマット}{2 = 見出し文字列フォーマット}{3 = 見出し文字列フォーマット（ラベル無し）}{4 = 副題フォーマット}{5 = 副題フォーマット（ラベル無し）}{6 = 全体フォーマット}{7 = *}{8 = 見出し}{9 = 副題} -% \jlreq@resultに出力対象を入れる -\long\def\jlreq@BlockHeading@start@makeoutput@@#1#2#3#4#5#6#7#8#9{% - \begingroup - % \jlreq@tempaに{ラベル}{見出し}{副題}という形のものを入れる - \jlreq@ifempty{#7}{% - % ラベルあり - \long\def\jlreq@tempa{#1}% - \long\def\jlreq@tempb##1{#2}% - \jlreq@ifempty{#9}{\def\jlreq@tempc##1{}}{\long\def\jlreq@tempc##1{#4}}% - }{% - \long\def\jlreq@tempa{}% - \long\def\jlreq@tempb##1{#3}% - \jlreq@ifempty{#9}{\def\jlreq@tempc##1{}}{\long\def\jlreq@tempc##1{#5}}% - }% - \edef\jlreq@tempa{{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb{#8}}}{\expandonce{\jlreq@tempc{#9}}}}% - \long\def\jlreq@tempb##1##2##3{#6}% - \edef\jlreq@tempa{\noexpand\expandonce{\noexpand\jlreq@tempb\expandonce{\jlreq@tempa}}}% - \edef\jlreq@do{\unexpanded{\def\jlreq@result}{\jlreq@tempa}}% - \expandafter\endgroup - \jlreq@do -} - -\def\jlreq@BlockHeading@start@removecolumn#1:{#1} - -% 空き指定を解釈する．a:10pt -> \jlreq@resulta=a，\jlreq@resultb=10pt -\def\jlreq@BlockHeading@start@analyzespace#1:#2\jlreq@endmark{% - \jlreq@ifempty{#1}{% - \def\jlreq@resulta{}% - \def\jlreq@resultb{}% - }{% - \let\jlreq@resulta=#1% - \edef\jlreq@resultb{\expandonce{\jlreq@BlockHeading@start@removecolumn#2}}% - }% -} - -% 行取り処理 -% {1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}{4 = 偶数ページ改ページするなら空}{5 = 出力} -\long\def\jlreq@BlockHeading@start@gyodori#1#2#3#4#5{{% - \par - \jlreq@ifempty{#4}{\jlreq@setcurrentpage}{}% - \setbox\jlreq@tempboxa=\vbox{#5}% - % \jlreq@tempskip(a/b)に前/後ろに入れるべき値を入れる - % #1がa:ならばその値は\jlreq@tempskipaには足さず\jlreq@tempskipcに入れておく - \jlreq@tempskipa=0pt - \jlreq@tempskipc=0pt - \jlreq@BlockHeading@start@analyzespace#1:\jlreq@endmark - \let\jlreq@maeakitype=\jlreq@resulta - \let\jlreq@maeaki=\jlreq@resultb - \jlreq@BlockHeading@start@analyzespace#2:\jlreq@endmark - \let\jlreq@ushiroakitype=\jlreq@resulta - \let\jlreq@ushiroaki=\jlreq@resultb - \def\jlreq@lines{#3}% - % 両方強制指定の場合は行数を無視する． - \ifx r\jlreq@maeakitype\ifx r\jlreq@ushiroakitype\def\jlreq@lines{}\fi\fi - \setbox\jlreq@tempboxb=\hbox{阿}% - \ifx\jlreq@lines\@empty - \ifx\jlreq@maeaki\@empty\else - \jlreq@tempskipa=\glueexpr\jlreq@maeaki\relax - \fi - \ifx\jlreq@ushiroaki\@empty\else - \jlreq@tempskipb=\glueexpr\jlreq@ushiroaki\relax - \fi - \else - % 行取り時の前後の空きを足した値を\jlreq@tempdimaに入れる - \jlreq@tempdima=\glueexpr(#3\baselineskip - \baselineskip - \ht\jlreq@tempboxa - \dp\jlreq@tempboxa)\relax - \ifx\jlreq@maeakitype\@empty - \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2\relax - \else - \ifx a\jlreq@maeakitype - \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2\relax - \jlreq@tempskipc=\glueexpr\jlreq@maeaki\relax - \fi - \ifx s\jlreq@maeakitype - \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2 + \jlreq@maeaki\relax - \jlreq@tempdima=\dimexpr\jlreq@tempdima + \jlreq@maeaki\relax - \fi - \ifx r\jlreq@maeakitype - \jlreq@tempskipa=\glueexpr\jlreq@maeaki\relax - \jlreq@tempdima=\dimexpr\jlreq@tempdima + \baselineskip - \dp\jlreq@tempboxb\relax - \fi - \fi - \ifx\jlreq@ushiroakitype\@empty - \jlreq@tempskipb=\glueexpr\jlreq@tempdima - \jlreq@tempskipa\relax - \else - \ifx a\jlreq@ushiroakitype - \jlreq@tempskipb=\glueexpr\jlreq@tempdima - \jlreq@tempskipa + \jlreq@ushiroaki\relax - \fi - \ifx r\jlreq@ushiroakitype - \jlreq@tempskipb=\glueexpr\jlreq@ushiroaki\relax - \jlreq@tempskipa=\glueexpr\jlreq@tempdima - \jlreq@tempskipb + \baselineskip - \ht\jlreq@tempboxb\relax - \fi - \fi - \fi - \jlreq@ifgluezero\jlreq@tempskipc{}{\vskip\jlreq@tempskipc\relax}% - \ifx r\jlreq@maeakitype\prevdepth=-1000pt\fi - \setbox\jlreq@tempboxa=\vbox{% - \jlreq@ifgluezero\jlreq@tempskipa{}{\vskip\jlreq@tempskipa}% - \unvbox\jlreq@tempboxa}% - \dp\jlreq@tempboxa=\dimexpr\dp\jlreq@tempboxa + \ht\jlreq@tempboxa\relax - \ht\jlreq@tempboxa=0pt - \box\jlreq@tempboxa - \jlreq@ifempty{#4}{\ifodd\jlreq@currentpage\nobreak\fi}{\nobreak}% - \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt\else\prevdepth=0pt\fi - \jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}% - \edef\jlreq@do{% - \unexpanded{\def\jlreq@parhook@gyodori}{% - \noexpand\parskip=\the\parskip - \unexpanded{\def\jlreq@parhook@gyodori{}}% - }% - \unexpanded{\parskip=0pt plus 1pt}% - }% -\expandafter}\jlreq@do} -\PushPostHook{par}{\jlreq@parhook@gyodori} -\def\jlreq@parhook@gyodori{} - -% 行取り情報をゲットだぜ -% \jlreq@resultに{1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}を入れる -% #2#3#4はそれぞれ前空き，後ろ開き，トータル行数のデフォルト値 -% *つきは\setkeys*を使う．[]はkeyvalのファミリー． -\def\jlreq@BlockHeading@gyodori@parsekeyval{% - \@ifstar{\jlreq@BlockHeading@gyodori@parsekeyval@{*}}{\jlreq@BlockHeading@gyodori@parsekeyval@{}}% -} -\def\jlreq@BlockHeading@gyodori@parsekeyval@#1{% - \@ifnextchar[{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}}{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}[jlreq@key]}% -} -\def\jlreq@BlockHeading@gyodori@parsekeyval@@#1[#2]#3#4#5#6{% - \begingroup - \def\jlreq@lines{#6}% - \def\jlreq@before@space{}% - \def\jlreq@before@lines{}% - \def\jlreq@after@space{}% - \def\jlreq@after@lines{}% - \jlreq@parsekeyval#1[#2]{ - {lines}{\def\jlreq@lines{##1}} - {before_space}{\def\jlreq@before@space{##1}} - {after_space}{\def\jlreq@after@space{##1}} - {before_lines}{% - \jlreq@iffirsttoken@ignorespaces{##1}{*}% - {\edef\jlreq@before@lines{s:\expandonce{\@gobble ##1}}}% - {\def\jlreq@before@lines{a:##1}}% - } - {after_lines}{\def\jlreq@after@lines{##1}} - }{#3}% - % before/after_lines優先 - \ifx\jlreq@before@space\@empty\else\edef\jlreq@before@space{r:\expandonce{\jlreq@before@space}}\fi - \ifx\jlreq@before@lines\@empty\else\edef\jlreq@before@space{\expandonce{\jlreq@before@lines}\baselineskip}\fi - \ifx\jlreq@before@space\@empty\def\jlreq@before@space{#4}\fi - \ifx\jlreq@after@space\@empty\else\edef\jlreq@after@space{r:\expandonce{\jlreq@after@space}}\fi - \ifx\jlreq@after@lines\@empty\else\edef\jlreq@after@space{a:\expandonce{\jlreq@after@lines}\baselineskip}\fi - \ifx\jlreq@after@space\@empty\def\jlreq@after@space{#5}\fi - \edef\jlreq@do{% - \unexpanded{\def\jlreq@result}{{\expandonce{\jlreq@before@space}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@lines}}}% - }% - \expandafter\endgroup - \jlreq@do -} - -% \DeclareBlockHeading{命令名}{レベル}{設定} -\def\jlreq@BlockHeading@allheadings{}% 別行見出し一覧 -\newcommand{\DeclareBlockHeading}[3]{% - \def\jlreq@do{\@removeelement{#1}}% - \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% - \appto\jlreq@heading@allheadings{,#1}% - \expandafter\jlreq@do\expandafter{\jlreq@BlockHeading@allheadings}{\jlreq@BlockHeading@allheadings}% - \appto\jlreq@BlockHeading@allheadings{,#1}% - \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% - \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% - \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewBlockHeading}% - \@ifundefined{c@#1}{\newcounter{#1}}{}% - \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% - \jlreq@heading@make@maketoc{#1}{#2}% - \begingroup - \def\jlreq@font{}% - \def\jlreq@subtitle@font{}% - \def\jlreq@indent{0\zw}% - \def\jlreq@end@indent{0\zw}% - \def\jlreq@align{l}% - \edef\jlreq@format{\unexpanded{##1##2##3}}% - \edef\jlreq@heading@text@format{\unexpanded{##1}}% - \def\jlreq@pagebreak{}% - \def\jlreq@label@format{\@seccntformat{#1}}% - \newif\ifjlreq@hang\jlreq@hangtrue - \def\jlreq@after@label@space{1\zw}% - \def\jlreq@second@heading@text@indent@wlabel{0pt}% - \def\jlreq@second@heading@text@indent@wolabel{0pt}% - \edef\jlreq@subtitle@format{\unexpanded{---##1---}}% - \def\jlreq@subtitle@indent{1\zw}% - \def\jlreq@afterindent{\@afterindenttrue}% - \def\jlreq@allowbreak@evenpage{*}% 偶数ページでも改ページを許可するならば空，そうでないなら* - \newif\ifjlreq@subtitle@break\jlreq@subtitle@breaktrue - \def\jlreq@subtitle@indent{1\zw}% - \def\jlreq@column@spanning{false}% - \newif\ifjlreq@column@spanning@possible\jlreq@column@spanning@possiblefalse - % a,bみたいなのをaとbにわける．カンマがなければbは空．引数を{a}{b}として##2を呼び出す． - \def\jlreq@parsecomma##1##2{% - \def\jlreq@tempa####1####2{##2}% - \def\@tempa####1,####2\jlreq@endmark{% - \jlreq@ifempty{####2}{% - \def\@tempa{}% - }{% - \def\@tempa########1,\jlreq@endmark{\def\@tempa{########1}}% - \@tempa####2\jlreq@endmark - }% - \edef\@tempa{\unexpanded{\jlreq@tempa{####1}}{\expandonce{\@tempa}}}% - \edef\jlreq@do{\jlreq@expandtwice{\@tempa}}% - }% - \@tempa##1,\jlreq@endmark - \jlreq@do - }% - \jlreq@parsekeyval[BlockHeading:#1]{ - {lines}{} - {before_space}{} - {after_space}{} - {before_lines}{} - {after_lines}{} - {font}{\def\jlreq@font{##1}} - {subtitle_font}{\def\jlreq@subtitle@font{##1}} - {indent}{\def\jlreq@indent{##1}} - {end_indent}{\def\jlreq@end@indent{##1}} - {align}[left,center,right]{% - \jlreq@switch{##1}{ - {left}{\def\jlreq@align{l}} - {center}{\def\jlreq@align{c}} - {right}{\def\jlreq@align{r}} - }% - } - {format}{\edef\jlreq@format{\unexpanded{##1}}} - {after_label_space}{\def\jlreq@after@label@space{##1}} - {second_heading_text_indent,heading_text_second_indent}{% - \jlreq@parsecomma{##1}{% - \jlreq@iffirsttoken{####1}{*}{% - \jlreq@hangfalse - \edef\jlreq@second@heading@text@indent@wlabel{\expandonce{\@gobble ####1}}% - }{% - \jlreq@hangtrue - \def\jlreq@second@heading@text@indent@wlabel{####1}% - }% - \jlreq@ifempty{####2}{% - \let\jlreq@second@heading@text@indent@wolabel=\jlreq@second@heading@text@indent@wlabel - }{% - \def\jlreq@second@heading@text@indent@wolabel{####2}% - }% - }% - } - {label_format}{\edef\jlreq@label@format{\unexpanded{##1}}} - {subtitle_format}{\edef\jlreq@subtitle@format{\unexpanded{##1}}} - {subtitle_indent}{\def\jlreq@subtitle@indent{##1}} - {subtitle_break}[true,false]{\csname jlreq@subtitle@break##1\endcsname} - {afterindent}[true,false]{\edef\jlreq@afterindent{\expandonce{\csname @afterindent##1\endcsname}}} - {allowbreak_if_evenpage}[true,false]{% - \jlreq@switch{##1}{ - {true}{\def\jlreq@allowbreak@evenpage{}} - {false}{\def\jlreq@allowbreak@evenpage{*}} - }% - } - {pagebreak}[clearpage,cleardoublepage,clearcolumn,nariyuki,begin_with_odd_page,begin_with_even_page]{% - \jlreq@switch{##1}{ - {clearpage}{\def\jlreq@pagebreak{\clearpage}\jlreq@column@spanning@possibletrue} - {cleardoublepage}{\def\jlreq@pagebreak{\cleardoublepage}\jlreq@column@spanning@possibletrue} - {clearcolumn}{\if@twocolumn\def\jlreq@pagebreak{\newpage}\else\def\jlreq@pagebreak{}\fi\jlreq@column@spanning@possiblefalse} - {begin_with_even_page}{\def\jlreq@pagebreak{\cleartoevenpage}\jlreq@column@spanning@possibletrue} - {begin_with_odd_page}{\def\jlreq@pagebreak{\cleartooddpage}\jlreq@column@spanning@possibletrue} - {nariyuki}{\def\jlreq@pagebreak{}\jlreq@column@spanning@possiblefalse} - }% - } - % 後々数字を受け付けるようになったりするかもしれないので…… - {column_spanning}{% - \jlreq@tempatrue % validな入力に対してfalse - \jlreq@ifempty{##1}{}{% - \jlreq@ifnumber{##1}{% 数字の時はtrueに回す - \jlreq@tempafalse - \def\jlreq@column@spanning{true}% - }{% - \jlreq@switch{##1}{% - {true}{\jlreq@tempafalse\def\jlreq@column@spanning{true}} - {false}{\jlreq@tempafalse\def\jlreq@column@spanning{false}} - }% - }% - }% - \ifjlreq@tempa\ClassWarningNoLine{jlreq}{Invalid input `##1' for column_spanning in BlockHeading #1}\fi - } - }{#3}% - \def\jlreq@do{}% 初期化．これに最終処理を入れていく． - % 入力チェック - \ifthenelse{\equal{\jlreq@column@spanning}{true}}{% - \ifjlreq@column@spanning@possible\else - \ClassWarningNoLine{jlreq}{column_spanning can be used only with `pagebreak=nariyuki' or `pagebreak=clearcolumn' (in BlockHeading #1)}% - \def\jlreq@column@spanning{false}% - \fi - }{}% - \edef\jlreq@format{\expandonce{\jlreq@font}\expandonce{\jlreq@format}}% - % 空き量などの調整を含んだラベル - \edef\jlreq@label@format@modified{% - \noexpand\noindent - \unexpanded{\setbox\jlreq@tempboxa=\hbox}{\expandonce{\jlreq@label@format}}% - \unexpanded{\hangindent=\glueexpr}(\expandonce{\jlreq@after@label@space}) + (\expandonce{\jlreq@second@heading@text@indent@wlabel})% - \ifjlreq@hang - +\wd\jlreq@tempboxa\relax - \else - \relax - \unexpanded{\edef\jlreq@BlockHeading@start@labellength{\the\wd\jlreq@tempboxa}}% - \fi - \box\jlreq@tempboxa - }% - \edef\jlreq@heading@text@format@wlabel{% - \ifdim\dimexpr\jlreq@after@label@space\relax=0pt\else - \noexpand\hspace*{\noexpand\dimexpr\expandonce{\jlreq@after@label@space}\noexpand\relax}% - \fi - \expandonce{\jlreq@heading@text@format}% - }% - \edef\jlreq@heading@text@format@wolabel{% - \ifdim\dimexpr\jlreq@second@heading@text@indent@wolabel\relax=0pt\else - \noexpand\hangindent=\noexpand\dimexpr\expandonce{\jlreq@second@heading@text@indent@wolabel}\noexpand\relax - \fi - \expandonce{\jlreq@heading@text@format}% - }% - \def\jlreq@make@subtitle@format##1##2{% - \edef##1{% - \ifjlreq@subtitle@break\unexpanded{{\par}\hangafter=0}\fi - \unexpanded{\hangindent=\dimexpr\hangindent + }(\expandonce{\jlreq@subtitle@indent}) ##2\noexpand\relax - \ifdim\jlreq@subtitle@indent=0pt\else - \ifjlreq@subtitle@break\else\unexpanded{\hspace*}{\expandonce{\jlreq@subtitle@indent}}\fi - \fi - \unexpanded{\nobreak\noindent}% - {\ifx\jlreq@subtitle@font\@empty\else\expandonce{\jlreq@subtitle@font}\fi\expandonce{\jlreq@subtitle@format}}% - }% - }% - \jlreq@make@subtitle@format\jlreq@subtitle@format@wlabel{% - - (\expandonce{\jlreq@second@heading@text@indent@wlabel})% - \ifjlreq@hang\else + (\noexpand\jlreq@BlockHeading@start@labellength)\fi - }% - \jlreq@make@subtitle@format\jlreq@subtitle@format@wolabel{- (\expandonce{\jlreq@second@heading@text@indent@wolabel})}% - \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% - \eappto\jlreq@do{\expandonce{\jlreq@result}}% - \jlreq@BlockHeading@gyodori@parsekeyval*[BlockHeading:#1]{#3}{}{}{1}% - \let\jlreq@spaceset=\jlreq@result - \edef\jlreq@totalformat{\unexpanded{##1}\expandonce{\jlreq@afterindent}\noexpand\@afterheading}% - \if@twocolumn - \ifthenelse{\equal{\jlreq@column@spanning}{true}}{% - \def\@tempa##1##2##3{% - % 前開きが常に入ってしまうので，a:の時は除去する - \jlreq@iffirsttoken{##1}{a}{\def\jlreq@spaceset{{}{##2}{##3}}}{} - \edef\jlreq@totalformat{% - \noexpand\twocolumn[% - % 普段自動で入る\topskipと\baselineskipを手動で入れる - \jlreq@iffirsttoken{##1}{r}{}{\unexpanded{\vskip\topskip\relax}}% - \unexpanded{####1}% - \jlreq@iffirsttoken{##2}{r}{}{\unexpanded{\vskip\glueexpr\baselineskip - \topskip\relax}}% - ]% - }% - }% - \expandafter\@tempa\jlreq@spaceset - }{}% - \fi - \edef\jlreq@do{% - \expandonce{\jlreq@do}% - \noexpand\edef\expandonce{\csname jlreq@headingcs@#1\endcsname}{\noexpand\unexpanded{% - \noexpand\jlreq@hook@beforeheadings{#1}% - \expandonce{\jlreq@pagebreak}% - \unexpanded{\jlreq@BlockHeading@start{#1}{#2}}% - {{\expandonce{\jlreq@align}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@end@indent}}\expandonce{\jlreq@spaceset}{\expandonce{\jlreq@allowbreak@evenpage}}}% - {% - {\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@label@format@modified}}% - {\expandonce{\jlreq@heading@text@format@wlabel}}{\expandonce{\jlreq@heading@text@format@wolabel}}% - {\expandonce{\jlreq@subtitle@format@wlabel}}{\expandonce{\jlreq@subtitle@format@wolabel}}% - {\expandonce{\jlreq@format}}% - }% - {\expandonce{\jlreq@totalformat}}% - }}% - \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq@headingcs@#1\endcsname}}% - }% - \expandafter\endgroup - \jlreq@do -} - -\newcommand{\NewBlockHeading}[3]{% - \expandafter\@ifdefinable\csname #1\endcsname{\DeclareBlockHeading{#1}{#2}{#3}}% -} -\newcommand{\RenewBlockHeading}[3]{% - \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareBlockHeading{#1}{#2}{#3}}% -} -\newcommand{\ProvideBlockHeading}[3]{% - \@ifundefined{#1}{\DeclareBlockHeading{#1}{#2}{#3}}{}% -} - -%.. 別行見出しが連続した場合の処理 -% 設定値保存に次のマクロを使う -% \jlreq@BlockHeading@spaces@headingslist -% : スペースを考慮しないとならない見出しのリスト．,_chapter_section_subsection,_section_subsection,...みたいな感じ -% \jlreq@BlockHeading@spaces@setlist@<見出し名リスト> -% : 見出し名リストが続いたときの空き関連設定．<見出し名リスト>は_chapter_section_subsectionみたいなやつ． -% {***}{***}...というリスト．各々の***は次のどれか． -% 最初：全体への指定．{前空き}{後ろ空き}{行数} -% _{前空き}{後ろ空き}{行数}：見出しに対する指定．先頭が_*の場合は，デフォルト設定をロードしてからということ． -% それ以外：空き量 -% 最初や最後に空き量指定がある場合は，全体への指定に組み込むことにする． -% -% 現在状況保存に以下のマクロを使う -% \jlreq@BlockHeading@spaces@current@sequence -% : 現在どのような見出しが続いているかリスト． -% \jlreq@BlockHeading@spaces@current@space@ -% : 現在処理中のn番目の見出しに対する空き情報．{前空き}{後ろ空き}{トータル行数}{偶数ページbreak情報}．n=1から始まる． -% \jlreq@BlockHeading@spaces@current@output@ -% : 現在処理中のn番目の見出しの中身． -% \jlreq@BlockHeading@spaces@current@format@ -% : 現在処理中のn番目の見出しのフォーマット．行取りマクロを包み込むようにする． -% \jlreq@BlockHeading@spaces@current@before@ -% : n番目の見出しの前に出すもの -% \jlreq@BlockHeading@spaces@current@after@ -% : n番目の見出しの後ろに出すもの -% \jlreq@BlockHeading@spaces@current@count -% : 現在いくつ目の連続する見出しを処理しているかのカウンター -\newcount\jlreq@BlockHeading@spaces@current@count -\jlreq@BlockHeading@spaces@current@count=0 -\def\jlreq@BlockHeading@spaces@current@sequence{} -\def\jlreq@BlockHeading@spaces@headingslist{} - -\newcommand{\SetBlockHeadingSpaces}[1]{% - \begingroup - % 現段階の情報をクリアする - \@for\jlreq@tempa:=\jlreq@BlockHeading@spaces@headingslist\do{% - \expandafter\let\csname jlreq@BlockHeading@spaces@setlist@\jlreq@tempa\endcsname=\@undefined - }% - \def\jlreq@BlockHeading@spaces@headingslist{}% - \def\jlreq@tempa{}% 見出しリスト - \def\jlreq@tempb{}% 設定リスト \def\jlreq@BlockHeading@spaces@***{{**}{**}...}ってのを入れる - \jlreq@SetBlockHeadingSpaces#1\jlreq@endmark - \edef\jlreq@do{% - \unexpanded{\def\jlreq@BlockHeading@spaces@headingslist}{\expandonce{\jlreq@tempa}}% - \expandonce{\jlreq@tempb}% - }% - \expandafter\endgroup - \jlreq@do -} -\def\jlreq@SetBlockHeadingSpaces{% カンマを無視する処理 - \@ifnextchar,{\expandafter\jlreq@SetBlockHeadingSpaces@\@gobble}{\jlreq@SetBlockHeadingSpaces@}% -} -\def\jlreq@SetBlockHeadingSpaces@{% - \@ifnextchar[{\jlreq@SetBlockHeadingSpaces@@}{\jlreq@SetBlockHeadingSpaces@@[]}% -} -\def\jlreq@SetBlockHeadingSpaces@@[#1]#2{% - \jlreq@ifendmark{#2}{}{% - \def\jlreq@headings{}% 見出し名リスト - \jlreq@BlockHeading@gyodori@parsekeyval[BlockHeadingSpaces]{#1}{}{}{}% - \let\jlreq@totalset=\jlreq@result% 上の#1に対応する設定 - \def\jlreq@set{}% 個々の設定 - \def\jlreq@lastdimen{}% 最後の寸法 - \def\jlreq@do##1##2##3{% - \jlreq@ifempty{##1}{\jlreq@tempatrue}{\jlreq@tempafalse}% 前開きが空ならば\jlreq@tempatrue - \jlreq@ifempty{##2}{\jlreq@tempbtrue}{\jlreq@tempbfalse}% 後ろ開きが空ならば\jlreq@tempbtrue - }% - \expandafter\jlreq@do\jlreq@totalset - \jlreq@SetBlockHeadingSpaces@@@{#2}% - \eappto\jlreq@tempa{,\expandonce{\jlreq@headings}}% \jlreq@tempaに\jlreq@headingsを追加 - \ifjlreq@tempb - \ifx\jlreq@lastdimen\@empty\else % 最後が寸法だったので\jlreq@SetBlockHeadingSpaces@totalsetを改変 - \def\jlreq@do##1##2##3{% - \edef\jlreq@totalset{{\unexpanded{##1}}{r:\expandonce{\jlreq@lastdimen}}{\unexpanded{##3}}}% - }% - \expandafter\jlreq@do\jlreq@totalset - \fi - \else - \eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}% - \fi - \eappto\jlreq@tempb{% - \noexpand\@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@headings}{}{% - \noexpand\ClassError{jlrqe}{The spaces for \jlreq@headings\space is defined more than once (in SetBlockHeadingSpaces)}{\noexpand\@ehc}% - }% - \noexpand\def\expandonce{\csname jlreq@BlockHeading@spaces@setlist@\jlreq@headings\endcsname}{{\expandonce{\jlreq@totalset}}\expandonce{\jlreq@set}}% - }% - \jlreq@SetBlockHeadingSpaces - }% -} -\def\jlreq@SetBlockHeadingSpaces@@@#1{% - \@for\@tempa:=#1\do{% - \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\@tempa}{_}{% - \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi% - \def\jlreq@lastdimen{}% - \expandafter\jlreq@SetBlockHeadingSpaces@@@@\@tempa{\jlreq@endmark}% - }{% - \ifjlreq@tempa - % 最初が寸法なので，全体の設定（\jlreq@totalset）に組み込む． - \def\jlreq@do##1##2##3{% - \edef\jlreq@totalset{{r:\expandonce{\@tempa}}{\unexpanded{##2}}{\unexpanded{##3}}}% - }% - \expandafter\jlreq@do\jlreq@totalset - \else - \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi - \let\jlreq@lastdimen=\@tempa - \fi - }% - \jlreq@tempafalse - }% -} -\def\jlreq@SetBlockHeadingSpaces@@@@#1#{% - \expandafter\jlreq@ifcontains\expandafter{\@gobble #1}{_}{% - \ClassWarning{jlreq}{Unusual heading name `\@gobble #1' is found. You forgot a comma? (in SetBlockHeadingSpaces)}% - }{}% - \jlreq@ifendswith{#1}{*}{{% - \def\@tempa_##1*{\def\@tempa{##1}}% - \@tempa#1% - \ClassWarning{jlreq}{The heading name `\@gobble #1' ends with `*'. Do you mean `\@tempa{*}'? (in SetBlockHeadingSpaces)}% - }}{}% - \appto\jlreq@headings{#1}% - \jlreq@SetBlockHeadingSpaces@@@@@ -} -\def\jlreq@SetBlockHeadingSpaces@@@@@#1{% - % 空っぽの場合は{_{r:0pt}{r:0pt}{}} - \jlreq@ifendmark{#1}{\appto\jlreq@set{{_{r:0pt}{r:0pt}{}}}}{% - \jlreq@iffirsttoken{#1}{*}{% *始まりの場合は{_*{}{}{}} - \expandafter\jlreq@BlockHeading@gyodori@parsekeyval\expandafter{\@gobble #1}{}{}{}% - \eappto\jlreq@set{{_*\expandonce{\jlreq@result}}}% - }{% それ以外の場合は{_{}{}{}} - \jlreq@BlockHeading@gyodori@parsekeyval{#1}{}{}{}% - \eappto\jlreq@set{{_\expandonce{\jlreq@result}}}% - }% - \@gobble % \jlreq@endmarkを食う - }% -} - -% 現在の情報に基づき出力 -\def\jlreq@BlockHeading@spaces@output{% - \@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@BlockHeading@spaces@current@sequence}{% - \jlreq@BlockHeading@spaces@outputwospace - }{% - \expandafter\expandafter\expandafter\jlreq@BlockHeading@spaces@output@\csname jlreq@BlockHeading@spaces@setlist@\jlreq@BlockHeading@spaces@current@sequence\endcsname\jlreq@endmark - }% -} - -% 連続スペース情報とか無視して各々の見出しを出力する -\def\jlreq@BlockHeading@spaces@outputwospace{% - \begingroup - \jlreq@tempcnta=0 - \def\jlreq@do{}% - \jlreq@BlockHeading@spaces@outputwospace@ - \jlreq@BlockHeading@spaces@clear - \expandafter\endgroup - \jlreq@do -} -\def\jlreq@BlockHeading@spaces@outputwospace@{% - \ifnum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count - \advance\jlreq@tempcnta by 1 - \eappto\jlreq@do{\csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}}% - \edef\jlreq@tempa{% - \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}% - }% - \jlreq@tempa - \edef\jlreq@tempb{% - \noexpand\expandonce{\noexpand\jlreq@tempa{% - \noexpand\jlreq@BlockHeading@start@gyodori - \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}% - {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}% - }}% - }% - \eappto\jlreq@do{\jlreq@tempb\csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}}% - \expandafter\jlreq@BlockHeading@spaces@outputwospace@ - \fi -} - -\def\jlreq@BlockHeading@spaces@output@#1#2\jlreq@endmark{% - \def\jlreq@result{}% - \jlreq@tempcnta=0 - \jlreq@BlockHeading@spaces@output@@#2\jlreq@endmark - \jlreq@tempatrue % 周りの行取り処理が必要か - \jlreq@ifempty{#1}{\jlreq@tempafalse}{}% - \ifthenelse{\equal{#1}{{}{}{}}}{\jlreq@tempafalse}{}% - \edef\jlreq@do{% - \ifjlreq@tempa - \unexpanded{\jlreq@BlockHeading@start@gyodori#1}{*}{% - \expandonce{\jlreq@result}% - }% - \else - \expandonce{\jlreq@result}% - \fi - }% - \jlreq@BlockHeading@spaces@clear - \jlreq@do -} -% jlreq@resultに出力すべきものを入れていく -\def\jlreq@BlockHeading@spaces@output@@#1{% - \jlreq@ifendmark{#1}{}{% - \jlreq@iffirsttoken@ignorespaces{#1}{_}{% - \advance\jlreq@tempcnta by 1 - \expandafter\jlreq@BlockHeading@spaces@output@@@\expandafter{\@gobble #1}% - }{% - \appto\jlreq@result{\vskip\glueexpr #1\relax}% - }% - \jlreq@BlockHeading@spaces@output@@ - }% -} -\def\jlreq@BlockHeading@spaces@output@@@#1{% - \edef\jlreq@do{% - \noexpand\jlreq@BlockHeading@spaces@output@@@@ - \jlreq@iffirsttoken@ignorespaces{#1}{*}{{*}\expandonce{\@gobble #1}}{{}#1}% - \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}% - {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}% - }% - \jlreq@do -} -% #1: デフォルト値を使うならば*，#2#3#4が設定された値，#5#6#7がデフォルト値，#8は偶数ページの，#9が出力 -\def\jlreq@BlockHeading@spaces@output@@@@#1#2#3#4#5#6#7#8#9{% - \edef\jlreq@tempa{% - \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}% - }% - \jlreq@tempa - \edef\jlreq@tempb{% - \noexpand\expandonce{\noexpand\jlreq@tempa{% - \noexpand\jlreq@BlockHeading@start@gyodori - \jlreq@ifempty{#1}{\unexpanded{{#2}{#3}{#4}}}{% - {\jlreq@ifempty{#2}{\unexpanded{#5}}{\unexpanded{#2}}}% - {\jlreq@ifempty{#3}{\unexpanded{#6}}{\unexpanded{#3}}}% - {\jlreq@ifempty{#4}{\unexpanded{#7}}{\unexpanded{#4}}}% - }\unexpanded{{#8}{#9}}% - }}% - }% - \eappto\jlreq@result{% - \csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}% - \jlreq@tempb - \csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}% - }% -} - -% 連続見出しスペース調整用のデータをすべてクリアする -\def\jlreq@BlockHeading@spaces@clear{% - \begingroup - \jlreq@tempcnta=0 - \@whilenum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count\do{% - \advance\jlreq@tempcnta by 1 - \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta\endcsname=\@undefined - \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta\endcsname=\@undefined - \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta\endcsname=\@undefined - \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta\endcsname=\@undefined - }% - \gdef\jlreq@BlockHeading@spaces@current@sequence{}% - \global\jlreq@BlockHeading@spaces@current@count=0 - \endgroup -} - -%.. 同行見出し -% {1 = 命令名}{2 = レベル}{3 = ラベルフォーマット}{4 = ラベルありフォーマット}{5 = ラベルなしフォーマット} -% 4,5は見出し文字列が#1になる． -\long\def\jlreq@RuninHeading@start#1#2#3#4#5{% - \edef\jlreq@RuninHeading@start@format@label{\unexpanded{#3}}% - \edef\jlreq@RuninHeading@start@format@wlabel{\unexpanded{#4}}% - \edef\jlreq@RuninHeading@start@format@wolabel{\unexpanded{#5}}% - \@ifstar{\@dblarg{\jlreq@RuninHeading@start@{#1}{#2}{*}}}{\@dblarg{\jlreq@RuninHeading@start@{#1}{#2}{}}}% -} -% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し} -\long\def\jlreq@RuninHeading@start@#1#2#3[#4]#5{% - \edef\jlreq@do{\noexpand\jlreq@RuninHeading@start@@{#1}{#2}{#3}{#4}{#5}{\expandonce{\jlreq@RuninHeading@start@format@label}}{\expandonce{\jlreq@RuninHeading@start@format@wlabel}}{\expandonce{\jlreq@RuninHeading@start@format@wolabel}}}% - \jlreq@do -} -% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し}{6 = ラベルフォーマット}{7 = ラベルありフォーマット}{8 = ラベルなしフォーマット} -\long\def\jlreq@RuninHeading@start@@#1#2#3#4#5#6#7#8{% - \if@noskipsec\leavevmode\fi - \begingroup - \def\jlreq@do{\global\@noskipsectrue}% - \ifnum0\jlreq@ifempty{#3}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0 - \def\jlreq@tempa##1{#8}% - \else - \appto\jlreq@do{\refstepcounter{#1}}% - \def\jlreq@tempa##1{#7}% - \fi - \par - \eappto\jlreq@do{% - \noexpand\everypar{% - \noexpand\if@noskipsec - \unexpanded{\global\@noskipsecfalse}% - \unexpanded{{\setbox\jlreq@tempboxa\lastbox}}% - \noexpand\begingroup - \expandonce{\jlreq@tempa{#5}}% - \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{#3}{#6}{#4}% - \noexpand\endgroup - \noexpand\else - \unexpanded{\everypar{}}% - \noexpand\fi - }% - }% - \expandafter\endgroup - \jlreq@do - \ignorespaces -} - -% \DeclareRuninHeading{命令名}{レベル}{設定} -\newcommand*{\DeclareRuninHeading}[3]{% - \def\jlreq@do{\@removeelement{#1}}% - \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% - \appto\jlreq@heading@allheadings{,#1}% - \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% - \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% - \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewRuninHeading}% - \@ifundefined{c@#1}{\newcounter{#1}}{}% - \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% - \@ifundefined{l@#1}{\expandafter\def\csname l@#1\endcsname{\@dottedtocline{#2}{0\zw}{2\zw}}}{}% - \jlreq@heading@make@maketoc{#1}{#2}% - \begingroup - \def\jlreq@font{\normalfont\normalsize}% - \def\jlreq@indent{0\zw}% - \def\jlreq@after@label@space{1\zw}% - \def\jlreq@mark{}% - \def\jlreq@label@font{}% - \def\jlreq@label@format{\@seccntformat{#1}}% - \def\jlreq@after@space{1\zw}% - \jlreq@parsekeyval[RuninHeading:#1]{% - {font}{\def\jlreq@font{##1}} - {indent}{\def\jlreq@indent{##1}} - {mark}{\def\jlreq@mark{##1}} - {label_format}{\def\jlreq@label@format{##1}} - {after_label_space}{ - \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_label_space in Runin Heading #1 should be not negative}\fi - \def\jlreq@after@label@space{##1} - } - {after_space}{% - \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_space in Runin Heading #1 should be not negative}\fi - \def\jlreq@after@space{##1}% - } - }{#3}% - \newif\ifjlreq@indent@zero - \jlreq@ifgluezero{\glueexpr\jlreq@indent\relax}{\jlreq@indent@zerotrue}{\jlreq@indent@zerofalse}% - \newif\ifjlreq@after@space@zero - \jlreq@ifgluezero{\glueexpr\jlreq@after@space\relax}{\jlreq@after@space@zerotrue}{\jlreq@after@space@zerofalse}% - \newif\ifjlreq@after@label@space@zero - \jlreq@ifgluezero{\glueexpr\jlreq@after@label@space\relax}{\jlreq@after@label@spacefalse}% - \edef\jlreq@format@wlabel{{% - \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi - \expandonce{\jlreq@font}% - \expandonce{\jlreq@label@format}% - \ifjlreq@after@label@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@label@space}\noexpand\relax\fi - ####1% - \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi - }}% - \edef\jlreq@format@wolabel{{% - \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi - \expandonce{\jlreq@font}% - ####1% - \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi - }}% - \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% - \edef\jlreq@do{% - \expandonce{\jlreq@result}% - % パラメータトークンを含むので，\edefして\unexpandedで包む - \noexpand\edef\expandonce{\csname #1\endcsname}{% - \noexpand\unexpanded{% - \unexpanded{\jlreq@hook@beforeheadings{#1}}% - \unexpanded{\jlreq@RuninHeading@start{#1}{#2}}{\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@format@wlabel}}{\expandonce{\jlreq@format@wolabel}}% - }% - }% - }% - \expandafter\endgroup - \jlreq@do -} -\newcommand*{\NewRuninHeading}[3]{% - \expandafter\@ifdefinable\csname #1\endcsname{\DeclareRuninHeading{#1}{#2}{#3}}% -} -\newcommand*{\RenewRuninHeading}[3]{% - \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareRuninHeading{#1}{#2}{#3}}% -} -\newcommand*{\ProvideRuninHeading}[3]{% - \@ifundefined{#1}{\DeclareRuninHeading{#1}{#2}{#3}}{}% -} - -%.. 窓見出し -\def\jlreq@CutinHeading@start#1#2#3#4#5#6#7{% - \par - \ifnum\hangafter=1 - \jlreq@CutinHeading@start@{#2}{#3}{#4}{#5}{#6}{#7}% - \else - \ClassError{jlreq}{Can not use \expandafter\string\csname#1\endcsname\space here}{\@ehc}% - \fi -} -% 1 = 書式指定，2 = インデント, 3 = 見出しと本文の間, 4 = これを越えたら二行以上，5 = これを越えたら三行以上，6 = テキスト -\def\jlreq@CutinHeading@start@#1#2#3#4#5#6{% - % 一行で処理したときの見出し長さを計測 - \begingroup - \setbox\@tempboxa=\hbox{#1#6}% - \@tempdima=\wd\@tempboxa - % 何行必要かを\jlreq@CutinHeading@linecountに入れる - \ifdim\@tempdima>#5\def\jlreq@CutinHeading@linecount{3}% - \else\ifdim\@tempdima>#4\def\jlreq@CutinHeading@linecount{2}% - \else\def\jlreq@CutinHeading@linecount{1}\fi\fi - % \@tempdimaが実際の一行の長さに近い - \divide\@tempdima by \jlreq@CutinHeading@linecount - % \jlreq@resultboxに見出し部分を，\jlreq@CutinHeading@linecountに見出し自身に何行使うかを入れる - \ifnum\jlreq@CutinHeading@linecount=1\relax - \setbox\jlreq@resultbox=\vbox{\parindent=0pt\rightskip=0pt\leftskip=0pt\hbox{#1#6}}% - \def\jlreq@CutinHeading@linecount{2}% - \else - \jlreq@inlinenote@determinelength{#6}{#1}{}{\jlreq@CutinHeading@linecount}{\jlreq@CutinHeading@linecount}{\@tempdima}{\linewidth}% - \def\jlreq@CutinHeading@linecount{3}% - \fi - % 普通の一行の高さ/深さに合わせて見出しのボックスを作る - \setbox\@tempboxa=\vtop to \dimexpr\numexpr\jlreq@CutinHeading@linecount - 1\relax\baselineskip + 1\zh\relax{\vskip 0pt plus 1fill minus 1fill \box\jlreq@resultbox\vskip 0pt plus 1fill minus 1fill}% - % 高さを通常の一行のそれにする - \setbox\jlreq@tempboxa=\hbox{阿}% - \dp\@tempboxa=\dimexpr\ht\@tempboxa + \dp\@tempboxa - \ht\jlreq@tempboxa\relax - \ht\@tempboxa=\ht\jlreq@tempboxa - \noindent - \hspace*{#2}% - \copy\@tempboxa - \hspace*{#3}% - \par - % でかい見出しボックスの分をキャンセルする空きを入れる - % \baselineskip - \ht\jlreq@tempboxaはTeXが挿入するスキップの分 - \vskip -\dimexpr\ht\@tempboxa + \dp\@tempboxa + \baselineskip - \ht\jlreq@tempboxa\relax\relax - \edef\jlreq@do{% - \noexpand\hangindent=\the\dimexpr#2 + \wd\@tempboxa + #3\relax\relax - \noexpand\hangafter=-\jlreq@CutinHeading@linecount\relax - }% - \expandafter\endgroup - \jlreq@do - \prevdepth=0pt - % 改段落が起こっても\hang****をキープするように\parを書き換えておく（終わったら元に戻す）． - \def\par{% - \ifvmode\jlreq@tempatrue\else\jlreq@tempafalse\fi - \jlreq@tempcnta=\hangafter\relax - \jlreq@tempdima=\hangindent\relax - \@@par - \ifjlreq@tempa\else\advance\jlreq@tempcnta by \prevgraf\relax\fi - \ifnum\jlreq@tempcnta<0 - \hangafter=\jlreq@tempcnta\relax - \hangindent=\jlreq@tempdima\relax - \else - \@restorepar - \fi - }% - \@afterindentfalse - \@afterheading - \ignorespaces -} - -\newcommand*{\DeclareCutinHeading}[3]{% - \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% - \expandafter\def\csname jlreq@heading@setting@#1\endcsname{#3}% - \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewCutinHeading}% - \begingroup - \def\jlreq@fontcommand{\sffamily\bfseries}% - \def\jlreq@onelinemax{6\zw}% - \def\jlreq@twolinemax{20\zw}% - \def\jlreq@indent{0\zw}% - \def\jlreq@after@space{1\zw}% - \jlreq@parsekeyval[CutinHeading:#1]{ - {font}{\def\jlreq@fontcommand{##1}} - {onelinemax}{\def\jlreq@onelinemax{##1}} - {twolinemax}{\def\jlreq@twolinemax{##1}} - {indent}{\def\jlreq@indent{##1}} - {after_space}{\def\jlreq@after@space{##1}} - }{#3}% - \ifthenelse{\lengthtest{\jlreq@after@space < 0.99\zw} \OR \lengthtest{\jlreq@after@space > 2.01\zw}}{% - \jlreq@note{窓見出しと本文との空き量は，基本版面の文字サイズの全角以上，2倍未満とする (4.1.10.c)．}% - }{}% - \edef\jlreq@do{% - \noexpand\def\expandonce{\csname #1\endcsname}{% - \noexpand\jlreq@CutinHeading@start{#1}{\expandonce{\jlreq@fontcommand}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@onelinemax}}{\expandonce{\jlreq@twolinemax}}% - }% - }% - \expandafter\endgroup - \jlreq@do -} -\newcommand*{\NewCutinHeading}[3]{% - \expandafter\@ifdefinable\csname #1\endcsname{\DeclareCutinHeading{#1}{#2}{#3}}% -} -\newcommand*{\RenewCutinHeading}[3]{% - \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareCutinHeading{#1}{#2}{#3}}% -} -\newcommand*{\ProvideCutinHeading}[3]{% - \@ifundefined{#1}{\DeclareCutinHeading{#1}{#2}{#3}}{}% -} - -\newcommand{\ModifyHeading}[2]{% - \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown heading: #1}{\@ehc}}% - \edef\jlreq@do{\csexpandonce{jlreq@heading@type@#1}{#1}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1},\unexpanded{#2}}}% - \jlreq@do -} -% 見出し#1をマクロ#2に保存する -\newcommand{\SaveHeading}[2]{% - \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown heading: #1}{\@ehc}}{}% - \edef#2{% - \csexpandonce{jlreq@heading@type@#1}{\unexpanded{#1}}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1}}% - }% -} - -\newcommand*{\jlreq@keepbaselineskip}[1]{% - \begingroup - \edef\jlreq@do{\unexpanded{#1}\noexpand\baselineskip=\the\baselineskip}% - \expandafter\endgroup - \jlreq@do -} - -\newcommand*\jlreq@HeadingType[1]{% - \ifcsname jlreq@heading@type@#1\endcsname - \jlreq@HeadingType@{#1}{\RenewTobiraHeading}{TobiraHeading}{% - \jlreq@HeadingType@{#1}{\RenewBlockHeading}{BlockHeading}{% - \jlreq@HeadingType@{#1}{\RenewRuninHeading}{RuninHeading}{% - \jlreq@HeadingType@{#1}{\RenewCutinHeading}{CutinHeading}{% - UnknownHeading}}}}% - \else - UndefinedHeading% - \fi -} -\newcommand*\jlreq@HeadingType@[2]{% - \expandafter\expandafter\expandafter\ifx\csname jlreq@heading@type@#1\endcsname#2\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi -} - -% 全ての見出しにマクロ#1を適用する． -\def\jlreq@heading@execmacro@toallheadings#1{% - \begingroup - \def\jlreq@do{}% - \ifx\jlreq@heading@allheadings\@undefined - \jlreq@heading@execmacro@toallheadings@{#1}{chapter,part,section,subsection,subsubsection,paragraph,subparagraph}% - \else - \def\@tempa{\jlreq@heading@execmacro@toallheadings@{#1}}% - \expandafter\@tempa\expandafter{\jlreq@heading@allheadings}% - \fi - \expandafter\endgroup - \jlreq@do -} - -\def\jlreq@heading@execmacro@toallheadings@#1#2{ - \@for\jlreq@tempa:=#2\do{% - \@ifundefined{\jlreq@tempa}{}{% - \eappto\jlreq@do{\noexpand#1{\expandonce{\jlreq@tempa}}}% - }% - }% -} -\def\jlreq@clearheadingmarks#1{% - \@ifundefined{#1mark}{}{% - \expandafter\let\csname#1mark\endcsname=\@gobble - }% -} - -%.. 各種定義 -\setcounter{secnumdepth}{3} -\newcounter{part} -\jlreq@switch{\jlreq@article@type}{ - {article}{\newcounter{section}} - {\newcounter{chapter}\newcounter{section}[chapter]}% book, report -} -\newcounter{subsection}[section] -\newcounter{subsubsection}[subsection] -\newcounter{paragraph}[subsubsection] -\newcounter{subparagraph}[paragraph] -\renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname} - -\if@tate - \renewcommand{\thepart}{\jlreq@Kanji{part}} - \ifthenelse{\equal{\jlreq@article@type}{article}}{}{\renewcommand{\thechapter}{\jlreq@Kanji{chapter}}} - \renewcommand{\thesection}{\jlreq@rensuji{\@arabic\c@section}} - \renewcommand{\thesubsection}{\jlreq@rensuji{\@alph\c@subsection}} - \renewcommand{\thesubsubsection}{\jlreq@rensuji{\@arabic\c@subsubsection}} - \renewcommand{\theparagraph}{(\jlreq@rensuji{\@arabic\c@paragraph})} - \renewcommand{\thesubparagraph}{(\jlreq@rensuji{\@arabic\c@subparagraph})} - - \ifthenelse{\equal{\jlreq@article@type}{article}}{ - \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE}},indent=4\zw,lines=4,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\large}}} - \if@twoside\ModifyHeading{part}{allowbreak_if_evenpage=true}\fi - } - {% book, report - \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\zw}},format={\null\vfill {\Huge\hspace*{2\zw}#1#2}\vspace*{2\jlreq@gol}}} - \NewBlockHeading{chapter}{0}{indent=2\zw,lines=6,label_format={第\thechapter 章},font={\huge},after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\Large}}} - \if@twoside\ModifyHeading{chapter}{allowbreak_if_evenpage=true}\fi - \renewcommand{\thechapter}{\jlreq@Kanji{chapter}} - } - \NewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\Large}},indent=6\zw,lines=3,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\normalsize}}} - \if@twoside\ModifyHeading{section}{allowbreak_if_evenpage=true}\fi - \NewBlockHeading{subsection}{2}{font={\jlreq@keepbaselineskip{\large}},indent=8\zw,lines=2,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\small}}} - \if@twoside\ModifyHeading{subsection}{allowbreak_if_evenpage=true}\fi - \NewBlockHeading{subsubsection}{3}{font={\jlreq@keepbaselineskip{\normalsize}},indent=10\zw,lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},,subtitle_font={\jlreq@keepbaselineskip{\scriptsize}}} - \if@twoside\ModifyHeading{subsubsection}{allowbreak_if_evenpage=true}\fi - \NewRuninHeading{paragraph}{4}{font={\jlreq@keepbaselineskip{\normalsize}}} - \NewRuninHeading{subparagraph}{5}{font={\jlreq@keepbaselineskip{\normalsize}},indent=1\zw} -\else% yoko - \renewcommand{\thepart}{\Roman{part}} - \renewcommand{\thesubsection}{\thesection .\arabic{subsection}} - \renewcommand{\thesubsubsection}{\thesubsection .\arabic{subsubsection}} - \renewcommand{\theparagraph}{\thesubsubsection .\arabic{paragraph}} - \renewcommand{\thesubparagraph}{\theparagraph .\arabic{subparagraph}} - \ifthenelse{\equal{\jlreq@article@type}{article}}{ - \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE\sffamily\bfseries}},label_format={第\thepart 部},lines=4,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\large}}} - \renewcommand{\thesection}{\arabic{section}} - } - {% book, report - \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq@gol}},format={\null\vfil {\Huge\sffamily\bfseries #1#2}\vfil}} - \NewBlockHeading{chapter}{0}{% - font={\jlreq@keepbaselineskip{\huge\sffamily\bfseries}}, - label_format={第\thechapter 章}, - lines=5,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw}, - subtitle_font={\jlreq@keepbaselineskip{\Large}}} - \renewcommand{\thechapter}{\arabic{chapter}} - \renewcommand{\thesection}{\thechapter.\arabic{section}} - } - \NewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\Large\sffamily\bfseries}},lines=3,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\normalsize}}} - \NewBlockHeading{subsection}{2}{font={\jlreq@keepbaselineskip{\large\sffamily\bfseries}},lines=2,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\small}}} - \NewBlockHeading{subsubsection}{3}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\scriptsize}}} - \NewRuninHeading{paragraph}{4}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},indent=1\zw} - \NewRuninHeading{subparagraph}{5}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},indent=2\zw} -\fi - -\ifthenelse{\equal{\jlreq@article@type}{article}}{}{% book, report - \if@openright - \ModifyHeading{part}{type=naka} - \if@tate - \ModifyHeading{chapter}{pagebreak=begin_with_even_page} - \else - \ModifyHeading{chapter}{pagebreak=begin_with_odd_page} - \fi - \else - \ModifyHeading{part}{type=han} - \ModifyHeading{chapter}{pagebreak=clearpage} - \fi -} -\jlreq@switch{\jlreq@article@type}{ - {book}{% - \renewcommand{\jlreq@heading@maketoc@chapter}[3]{% - \jlreq@ifempty{#1}{% - \chaptermark{#3}% - \ifnum0\if@mainmatter\else1\fi\ifnum\jlreq@heading@level@chapter>\c@secnumdepth 1\fi>0 - \addcontentsline{toc}{chapter}{#3}% - \else - \addcontentsline{toc}{chapter}{\protect\numberline{#2}#3}% - \fi - }{}% - } - } - {report}{ - \renewcommand{\jlreq@heading@maketoc@chapter}[3]{% - \jlreq@ifempty{#1}{% - \chaptermark{#3}% - \ifnum0\ifnum\jlreq@heading@level@chapter>\c@secnumdepth 1\fi>0 - \addcontentsline{toc}{chapter}{#3}% - \else - \addcontentsline{toc}{chapter}{\protect\numberline{#2}#3}% - \fi - }{}% - } - } -} - - -%. 注 -% 文字サイズは6ポイントくらい（4.2.3.a）とりあえす\scriptsize -%.. 合印（4.2.3） -\newcommand*\jlreq@referencemark@format[1]{#1} -\newif\ifjlreqadjustreferencemark -\jlreqadjustreferencemarktrue -\jlreq@jlreqsetup@add{reference_mark}[inline,interlinear]{ - \def\jlreq@referencemark{#1} - \ifthenelse{\equal{\jlreq@referencemark}{inline}}{ - \def\jlreq@notemark##1{% - \jlreq@ifydir{% - \hbox{}\hbox{\@textsuperscript{\normalfont\jlreq@referencemark@format{##1}}}\hbox{}% - }{% - \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}% - \raise\dimexpr.5\jlreq@gol - \ht\@tempboxa\relax\box\@tempboxa - }% - } - \def\jlreq@hook@prenote{\inhibitglue} - \def\jlreq@hook@postnote{\inhibitglue} - }{% reference_mark=interlinear - \def\jlreq@notemark##1{{% - \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}% - \@tempdima=\wd\@tempboxa - % 行頭に来たときに頭を天にそろえる処理． - \ifjlreqadjustreferencemark - \jlreq@savepos@for@rest@linewidth - \ifdim\jlreq@current@linewidth<\wd\@tempboxa - \@tempdima=\jlreq@current@linewidth - \fi - \fi - \setbox\jlreq@tempboxb=\hbox{阿}% - \setbox\jlreq@tempboxa=\hbox to\z@{\hskip-\@tempdima\raise\dimexpr\ht\jlreq@tempboxb + \dp\@tempboxa\relax\box\@tempboxa\hss}% - \dp\jlreq@tempboxa=0pt\ht\jlreq@tempboxa=0pt\box\jlreq@tempboxa% - }}% - \ifx l\jlreq@engine - \def\jlreq@hook@prenote{% - \jlreq@lastnodechar=\lastnodechar\relax - \ifnum\lastnodechar>-1\inhibitglue\fi - } - \else - % (u)platexの時は代入すると\inhibitglueが効かなくなる - \def\jlreq@hook@prenote{% - \ifnum\lastnodechar>-1\inhibitglue\fi - \jlreq@lastnodechar=\lastnodechar\relax - } - \fi - \def\jlreq@hook@postnote{\jlreq@fixjfm} - } -} -\jlreqsetup{reference_mark=inline} -% \@footnotemarkをシンプルなものにする -\def\jlreq@setdefaultnotemark#1#2{% - \def#1{% - \leavevmode - \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi - #2% - \ifhmode\spacefactor\@x@sf\fi - \relax}% -} -\jlreq@setdefaultnotemark\@footnotemark\@makefnmark - -%.. 脚注（4.2.5） -% （縦書きの時は傍注，4.2.6） -% 罫線の前は行間分，最大＋文字サイズ分伸びる（4.2.5.g） -\setlength{\skip\footins}{\dimexpr\baselineskip - 1\jlreq@gol \relax plus 1\jlreq@gol} -% 罫線の長さは，基本版面で設定した行長にもよるが，行長の1/3くらいにする． -\def\jlreq@footnote@rulewidth{.333\textwidth} -\begingroup - \footnotesize - \edef\jlreq@do{ - \unexpanded{\setlength{\footnotesep}}{\the\dimexpr .7\baselineskip\relax}% 何でかわからん…… - \unexpanded{\def\footnoterule}{% - % この罫線は，表罫（おもてけい）とする． - \unexpanded{\hrule width \jlreq@footnote@rulewidth height \jlreq@omotekeiwidth}% - % 脚注の行間よりやや広くする（4.2.5.f） - \noexpand\kern\the\dimexpr 1.5\dimexpr\baselineskip - 1\zh\relax\relax - } - } -\expandafter\endgroup -\jlreq@do - -% インデントの計算：脚注の長さが文字の整数倍になるように字下げする（4.2.5.b） -\jlreq@jlreqsetup@add{footnote_indent}{% - \if@tate\else - \ifdim\dimexpr#1\relax=0pt\else\jlreq@note{脚注は，一般にその前に区切りのための罫線を挿入するので，字下げは行わなくてよい（4.2.5.b）．}\fi - \fi - \begingroup - \footnotesize - \jlreq@footnoteindent=\dimexpr#1\relax - \@tempdima=\dimexpr\textwidth - \jlreq@footnoteindent\relax - \@tempdimb=1\zw - \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb - \edef\jlreq@do{\noexpand\jlreq@footnoteindent=\the\dimexpr\textwidth - \@tempdima\relax}% - \expandafter\endgroup - \jlreq@do -} -\if@tate - \jlreqsetup{footnote_indent=1\zw}% 根拠なし -\else - \jlreqsetup{footnote_indent=0pt}% （4.2.5.b） -\fi - -\newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}} -\jlreq@jlreqsetup@add{footnote_second_indent}{% - \if@tate\else - \ifthenelse{ - \( \lengthtest{0.99\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < 1.01\zw} \) \OR - \( \lengthtest{-1.01\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < -0.99\zw} \) - }{}{\jlreq@note{脚注が2行以上となった場合，脚注の2行目以下の字下げを1行目より，脚注の文字サイズの全角アキとするか，逆に，1行目の字下げを2行目より，脚注の文字サイズの全角アキとする (4.2.5.d)．}} - \fi - \ifdim\dimexpr #1\relax<0pt - \def\jlreq@makefntext{} - \else - \def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}} - \fi - \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}% - \unexpanded{% - \addtolength{\leftskip}{\jlreq@footnoteindent}% - \parindent=1\zw - \noindent - \hskip-\glueexpr #1\relax - \jlreq@referencemark@format{\@thefnmark}% - \hskip\glueexpr 1\zw\relax - }##1% - } -} -\jlreqsetup{footnote_second_indent=1\zw} - -\jlreq@jlreqsetup@add{footnotetext_indent}{ - \ClassWarningNoLine{jlreq}{footnotetext_indent was removed} -} - -\ifx l\jlreq@engine - \fnfixbottomtrue -\fi - -% \footnoteと\footnotemarkの前後に\jlreq@hook@prenote/\jlreq@hook@postnoteを入れる -\jlreq@saveoriginalcs{\footnote} -\jlreq@saveoriginalcs{\footnotemark} -\def\footnote{% - \jlreq@hook@prenote - \@ifnextchar[{\jlreq@footnote@impl@woption}{\jlreq@footnote@impl@wooption}% -} -\def\footnotemark{% - \jlreq@hook@prenote - \@ifnextchar[{\jlreq@footnotemark@impl@woption}{\jlreq@footnotemark@impl@wooption}% -} -\if@tate - % 縦組の傍注は，その見開き内に付いている合印に対応する注を，奇数ページの左端にそろえて配置する．多段組では最下段の左端にそろえて配置する．（4.2.6.a） - % 必要ならば\footnoteを\footnotemarkと\footnotetextにわけ，\footnotetextをアウトプット時まで遅延することで実現する． - \def\jlreq@footnote@delayfootnoteslist{} - \preto\@opcol{% - \expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}% - \jlreq@footnote@delayfootnoteslist - } - % \jlreq@footnote@delayfootnote@delay#1#2#3：#1ページ目に\footnotetext[#2]{#3}を出す - % \jlreq@footnote@delayfootnote@page：何ページ目に\footnotetextを入れるかを\jlreq@resultcntに入れる．その場での場合は-1． - \if@twocolumn - \def\jlreq@footnote@delayfootnote@page{% - \jlreq@setcurrentpage - \jlreq@resultcnt=\numexpr\jlreq@currentpage\ifodd\jlreq@currentpage\else + 1\fi\relax - % このページに表示＆上の段処理済みだと\output内では間に合わない - \ifnum\jlreq@resultcnt=\value{page}\if@firstcolumn\else\jlreq@resultcnt=-1 \fi\fi - } - \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{% - % 二段組みの場合は上段を組んだ直後に\footnotetextを挿入（そのページの下段に入る） - \ifnum 0\if@firstcolumn\else 1\fi\ifnum#1>\value{page}1\fi>0 - \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% - \else - \footnotetext[#2]{#3}% - \fi - } - \else - \def\jlreq@footnote@delayfootnote@page{% - \jlreq@setcurrentpage - \ifodd\jlreq@currentpage - \jlreq@resultcnt=-1 - \else - \jlreq@resultcnt=\numexpr\jlreq@currentpage+1\relax - \fi - } - \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{% - % 一段組の場合はその前のページを組んだ直後に\footnotetextを挿入． - \ifnum\numexpr#1 - 1\relax>\value{page}% - \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% - \else - \footnotetext[#2]{#3}% - \fi - } - \fi - \def\jlreq@footnote@delayfootnote@immediate#1#2#3{% - \ifnum #1<\jlreq@currentpage - \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% - \else - \footnotetext[#2]{#3}% - \fi - } - \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay - \def\jlreq@footnote@flushdelayfootnoteslist{% - \ifx\jlreq@footnote@delayfootnoteslist\@empty\else - \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@immediate - \jlreq@setcurrentpage - \expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}% - \jlreq@footnote@delayfootnoteslist - \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay - \fi - } - \AtEndDocument{\jlreq@footnote@flushdelayfootnoteslist} - \preto\newpage{\jlreq@footnote@flushdelayfootnoteslist} - \long\def\jlreq@footnote@impl@woption[#1]#2{% - \jlreq@footnote@delayfootnote@page - \ifnum\jlreq@resultcnt=-1 - \jlreq@useoriginalcs{\footnote}[#1]{#2}% - \else - \jlreq@useoriginalcs{\footnotemark}[#1]% - \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\unexpanded{#1}}{\unexpanded{#2}}}% - \fi - \jlreq@hook@postnote - } - \long\def\jlreq@footnote@impl@wooption#1{% - \jlreq@footnote@delayfootnote@page - \ifnum\jlreq@resultcnt=-1 - \jlreq@useoriginalcs{\footnote}{#1}% - \else - \jlreq@useoriginalcs{\footnotemark}% - \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\the\value{footnote}}{\unexpanded{#1}}}% - \fi - \jlreq@hook@postnote - } -\else - \long\def\jlreq@footnote@impl@woption[#1]#2{% - \jlreq@useoriginalcs{\footnote}[#1]{#2}% - \jlreq@hook@postnote - } - \long\def\jlreq@footnote@impl@wooption#1{% - \jlreq@useoriginalcs{\footnote}{#1}% - \jlreq@hook@postnote - } -\fi -\long\def\jlreq@footnotemark@impl@woption[#1]{% - \jlreq@useoriginalcs{\footnotemark}[#1]% - \jlreq@hook@postnote -} -\long\def\jlreq@footnotemark@impl@wooption{% - \jlreq@useoriginalcs{\footnotemark}% - \jlreq@hook@postnote -} - -% 合印 -\renewcommand*{\@makefnmark}{% - \jlreq@ifydir{\jlreq@notemark{\@thefnmark}}{\hbox{\jlreq@notemark{\@thefnmark}}}% -} -% 4.2.2注3 -\if@tate - \renewcommand*{\thefootnote}{\jlreq@open@bracket@before@space\inhibitglue（\jlreq@rensuji{\@arabic\c@footnote}）\inhibitglue} -\else - \renewcommand*{\thefootnote}{\arabic{footnote}\hbox{}）\inhibitglue} -\fi -\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\@addtoreset{footnote}{chapter}} - - -%.. 後注（4.2.4） -\def\jlreq@endnotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名 -\def\jlreq@endnotecounter{footnote}% 後注用のカウンタ名 -% 文字サイズは\footnotesizeを使う -\newdimen\jlreq@endnote@prepostspace -% 前の分との間は行間分空ける（4.2.4.f） -\jlreq@endnote@prepostspace=\dimexpr\baselineskip - 1\jlreq@gol\relax -\newdimen\jlreq@endnote@indent -% 現在の後注一覧を，\jlreq@endnote@textsに{{合印1}{後注1}}{{合印2}{後注2}}...の形で保持する -\def\jlreq@endnote@texts{} -\long\def\jlreq@endnote@addtext#1#2{\xappto\jlreq@endnote@texts{\unexpanded{{{#1}{#2}}}}} -% \endnote自身は後で定義する -\def\jlreq@endnote@impl{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnote}{\jlreq@endnote[]}} -\def\endnotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnotemark}{\jlreq@endnotemark[]}} -\def\endnotetext{\@ifnextchar[{\jlreq@endnotetext}{\jlreq@endnotetext[]}} -\long\def\jlreq@endnote[#1]#2{\jlreq@endnotemark[#1]\@endnotetext{#2}\jlreq@hook@postnote} -\def\jlreq@endnotemark[#1]{% - \jlreq@ifempty{#1}{% - \stepcounter{\jlreq@endnotecounter}% - \expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% - }{% - \begingroup - \csname c@\jlreq@endnotecounter\endcsname #1\relax - \expandafter\unrestored@protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% - \endgroup - }% - \@endnotemark - \jlreq@hook@postnote -} -\jlreq@setdefaultnotemark\@endnotemark\@makeendmark -\long\def\jlreq@endnotetext[#1]#2{% - \jlreq@ifempty{#1}{% - \expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% - }{% - \begingroup - \csname c@\jlreq@endnotecounter\endcsname #1\relax - \expandafter\unrestored@protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% - \endgroup - }% - \@endnotetext{#2}% -} -\long\def\@endnotetext#1{% - \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname\jlreq@endnotemarkname\endcsname - \expandafter\jlreq@endnote@addtext\expandafter{\jlreq@tempa}{#1}% -} -\long\def\jlreq@theendnotes#1{% - \jlreq@ifendmark{#1}{}{% - \jlreq@output@endnotes#1 - \jlreq@theendnotes - }% -} -\long\def\jlreq@output@endnotes#1#2{% - \expandafter\def\csname\jlreq@endnotemarkname\endcsname{#1}% - \item\@makeendtext{#2}% -} - -\newcommand*{\theendnotes}{% - \ifx\jlreq@endnote@texts\@empty\else - \let\jlreq@tempa=\jlreq@endnote@texts - \gdef\jlreq@endnote@texts{}% - \edef\jlreq@endnote@beforeafterspace{\the\dimexpr\baselineskip - 1\jlreq@gol\relax plus \the\dimexpr 1\jlreq@gol\relax}% - \begingroup - \par - \footnotesize - % 後注の長さを文字サイズの整数倍にする（4.2.4.b） - \jlreq@tempdima=\dimexpr\linewidth - \jlreq@endnote@indent - \leftskip\relax - \@tempdimb=1\jlreq@mol - \divide\jlreq@tempdima\@tempdimb\multiply\jlreq@tempdima\@tempdimb - \begin{list}{}{% - \itemsep=0pt\relax - \parsep=0pt\relax - \partopsep=0pt\relax - \topsep=0pt\relax - \leftmargin=\dimexpr\linewidth - \jlreq@tempdima + \jlreq@endnote@second@indent\relax - \itemindent=0pt\relax - \topsep=\jlreq@endnote@beforeafterspace - }% - \expandafter\jlreq@theendnotes\jlreq@tempa\jlreq@endmark - \end{list} - \endgroup - \par - \fi -} -% 4.2.4.b -\jlreq@endnote@indent=2\jlreq@mol -\jlreq@jlreqsetup@add{endnote_second_indent}{ - \def\jlreq@endnote@second@indent{#1} - \ifthenelse{ - \( \lengthtest{0.99\zw < #1} \AND \lengthtest{#1 < 1.01\zw} \) \OR - \( \lengthtest{1.99\zw < #1} \AND \lengthtest{#1 < 2.01\zw} \) - }{}{\jlreq@note{後注が2行以上となった場合，後注の2行目以下の字下げは，1行目より，後注の文字サイズの2倍又は全角とする (4.2.4.d)．}} -} -\jlreqsetup{endnote_second_indent=2\zw} -\newcommand{\@makeendtext}[1]{\parindent 1\zw - \hskip\glueexpr-\jlreq@endnote@second@indent\relax\csname\jlreq@endnotemarkname\endcsname\hskip\glueexpr1\zw\relax#1}% 見出し出力と一文字分の空き（4.2.4.c） -\let\@makeendmark=\@makefnmark - -% \theendnoteの出力を仕込む -\apptocmd{\jlreq@hook@beforeheadings}{\jlreq@endnote@hook@beforeheadings{#1}}{}{} - -\jlreq@jlreqsetup@add{endnote_position}{ - \def\jlreq@endnote@hook@beforeheadings##1{} - \jlreq@tempafalse % headingsが指定された - \jlreq@tempbfalse % paragraphが指定された - % \jlreq@tempcにセクション名たちを入れていく - \def\jlreq@tempc{} - \@for\jlreq@tempa:=#1\do{ - \jlreq@switch{\jlreq@tempa}{ - {headings}{\jlreq@tempatrue} - {paragraph}{ - \jlreq@tempatrue% _paragraphの時は_headingsも有効にする - \jlreq@tempbtrue - } - { - \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\jlreq@tempa}{_}{ - \edef\jlreq@tempc{\jlreq@tempc,\expandafter\@gobble\jlreq@tempa} - }{ - \ClassError{jlreq}{Invalid value \jlreq@tempa\space in endnote_position}{\@ehc} - } - } - } - } - - \ifjlreq@tempb - \edef\endnote{\unexpanded{\def\par{\@restorepar\theendnotes\par}}\expandonce{\jlreq@endnote@impl}} - \else - \let\endnote=\jlreq@endnote@impl - \fi - - \ifjlreq@tempa - \apptocmd{\jlreq@endnote@hook@beforeheadings}{\theendnotes}{}{} - \else - \@for\@tempa:=\jlreq@tempc\do{ - \ifx\@tempa\@empty\else - \edef\jlreq@do{% - \unexpanded{\def\jlreq@endnote@hook@beforeheadings##1}{\expandonce{\jlreq@endnote@hook@beforeheadings{##1}}% - \unexpanded{\def\@tempa}{\@tempa}\unexpanded{\def\@tempb{##1}}% - \unexpanded{\ifx\@tempa\@tempb\theendnotes\fi}% - } - } - \jlreq@do - \fi - } - \fi -} -\jlreqsetup{endnote_position=headings} -\AtEndDocument{\theendnotes} - - -% (1) \footnoteとかと同じ形式 sidenote_type=number -% (2) 文中にマークを入れて，傍注には見出しが入る sidenote_type=symbol -% (3) 文中は強調文字列，傍注には見出しが入る sidenote_type=symbol -% (4) 文中は何も無し，傍注には見出しが入る sidenote_type=symbol - -% (1) では\sidenote[]{}を定義 -% (2) では\sidenote{見出し}{注中身}を定義 -% \marginparwidth>0ptの時のみ定義する -\ifdim\marginparwidth>0pt \expandafter\@firstofone\else\expandafter\@gobble\fi -{ - \def\jlreq@sidenotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名 - \long\def\@sidenotetext#1{% - \marginpar{\reset@font\footnotesize - \color@begingroup - \@makesidetext{#1}% - \color@endgroup - }% - } - \jlreq@setdefaultnotemark\@sidenotemark\@makesidemark - \def\jlreq@sidenotecounter{footnote}% 傍注用のカウンタ名 - \jlreq@jlreqsetup@add{sidenote_type}[number,symbol]{\def\jlreq@sidenote@type{#1}} - \jlreqsetup{sidenote_type=number} - \jlreq@jlreqsetup@addtofinally{ - \ifthenelse{\equal{\jlreq@sidenote@type}{number}}{ - \def\sidenote{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenote}{\jlreq@sidenote[]}} - \def\sidenotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenotemark}{\jlreq@sidenotemark[]}} - \def\sidenotetext{\@ifnextchar[{\jlreq@sidenotetext}{\jlreq@sidenotetext[]}} - \long\def\jlreq@sidenote[#1]#2{\jlreq@sidenotemark[#1]\@sidenotetext{#2}\jlreq@hook@postnote} - \def\jlreq@sidenotemark[#1]{% - \jlreq@ifempty{#1}{% - \stepcounter{\jlreq@sidenotecounter}% - \expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% - }{% - \begingroup - \csname c@\jlreq@sidenotecounter\endcsname #1\relax - \expandafter\unrestored@protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% - \endgroup - }% - \@sidenotemark - \jlreq@hook@postnote - } - \long\def\jlreq@sidenotetext[#1]#2{% - \jlreq@ifempty{#1}{% - \expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% - }{% - \begingroup - \csname c@\jlreq@sidenotecounter\endcsname#1\relax - \expandafter\unrestored@protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% - \endgroup - }% - \@sidenotetext{#2}% - } - % \hspace{0.5\jlreq@mol}の部分は二分空きにする例もある（4.2.7.g） - \ifx l\jlreq@engine - \long\def\@makesidetext#1{\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1} - \else - % thefootnote = \inhibitglue （...だと\inhibitglueが効かないので空白を挟む - \long\def\@makesidetext#1{　\kern-1\zw\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1} - \fi - \let\@makesidemark=\@makefnmark - }{% sidenote_type = symbol - \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}} - \def\sidenotemark#1{\jlreq@sidenotemark{#1}} - \long\def\sidenotetext#1#2{\jlreq@sidenotetext{#1}{#2}} - \long\def\jlreq@sidenote#1#2{\jlreq@sidenotemark{#1}\jlreq@sidenotetext{#1}{#2}} - \edef\jlreq@sidenotemark#1{% - {\unexpanded{\reset@font\jlreq@sidenote@keywordfont}#1}% - \noexpand\jlreq@hook@prenote - \ifx\jlreq@sidenote@defaultmark\@empty\else - \expandafter\edef\expandonce{\csname\jlreq@sidenotemarkname\endcsname}{\expandonce{\jlreq@sidenote@defaultmark}}% - \noexpand\@sidenotemark - \fi - } - % カスタマイズできるべき？ - \long\def\jlreq@sidenotetext#1#2{% - \expandafter\def\csname\jlreq@sidenotemarkname\endcsname{\inhibitglue\null{\reset@font\sffamily\bfseries\inhibitglue #1}}% - \@sidenotetext{#2}% - } - \long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq@sidenotemarkname\endcsname}\hspace*{1\jlreq@mol}#1} - \let\@makesidemark=\@makefnmark - - \apptocmd{\sidenote}{\jlreq@hook@postnote}{}{} - \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{} - } - } - \jlreq@jlreqsetup@add{sidenote_symbol}{\def\jlreq@sidenote@defaultmark{#1}} - \jlreq@jlreqsetup@add{sidenote_keyword_font}{\def\jlreq@sidenote@keywordfont{#1}} - \jlreqsetup{sidenote_symbol=＊,sidenote_keyword_font={}} -} - -%.. 割注（3.4） -\def\inlinenotesize{.6\jlreq@jafontsize} % 割注の文字サイズ -\let\jlreq@inlinenote@autolinebreak=\\% 計測時は\linebreakより\\の方が安定する．悩ましい……． - -\newcommand{\jlreq@inlinenote@kakkofontsize}{% - \fontsize{\dimexpr\inlinenotesize * 2\relax}{\dimexpr \inlinenotesize * 2\relax}% - \selectfont -} - -\newcommand{\jlreq@inlinenote@fontsize}{% - \fontsize{\inlinenotesize}{\inlinenotesize}% - \selectfont -} - -% 割注を入れるための命令．\inlinenote{割注}で使う． -% 改行位置は自動で計算されるが，常に正しいとは限らない． -% \inlinenote*は自動で改行されない．\\で改行位置を指定する． -\newif\ifjlreq@in@inlinenote -\jlreq@in@inlinenotefalse -\newcommand*{\inlinenote}{% - \ifjlreq@in@inlinenote\ClassError{jlreq}{\string\inlinenote\space can't be nested}{\@ehc}\fi - \jlreq@in@inlinenotetrue - \ifvmode\leavevmode\fi - \@ifstar\jlreq@inlinenote@noauto\jlreq@inlinenote@auto} -\let\warichu=\inlinenote - -\newcommand*{\jlreq@inlinenote@auto}[1]{% - % 割注初め括弧の前の場所を保存 - \jlreq@savepos@for@rest@linewidth - % \jlreq@tempdimbに，現在行の残り長さを入れる - \jlreq@tempdimb=\jlreq@rest@linewidth - % 括弧の分を引いたものが，割注の使える長さ - \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（\inhibitglue}% - \addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}% - \ifdim\jlreq@tempdimb<0pt\jlreq@tempdimb=\linewidth\fi - {% - \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue \jlreq@open@bracket@before@space（}% - \jlreq@box@putcenter\jlreq@tempboxa - }% - % 「初回」時はここに強制改行を入れる．これにより現在位置の取得がより正しくなる……といいなぁ - \jlreq@savepos@iflabelundefined{\\}{}% - % 割注内の\baselineskipを保存（後で使う）． - {\jlreq@inlinenote@fontsize\xdef\jlreq@inlinenote@baselineskip{\the\baselineskip}}% - % 普通に並べた長さを計測し，その半分から始める - \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize #1}% - \jlreq@tempdimc=\wd\@tempboxa - \divide\jlreq@tempdimc by 2\relax - % \@tempcntbに，この長さで計測した場合の行数を入れる - \ifdim\jlreq@tempdimc<\jlreq@tempdimb\@tempcntb=2\relax - \else - \jlreq@tempdima=\dimexpr\jlreq@tempdimc - \jlreq@tempdimb\relax - \divide\jlreq@tempdima\linewidth - \@tempcntb=\number\jlreq@tempdima - \multiply\@tempcntb by 2\relax - \advance\@tempcntb by 4\relax - \fi - % \jlreq@parshapeargに\parshapeに指定する書式の最後以外を入れる． - \ifnum\@tempcntb>2\relax - \edef\jlreq@parshapearg{0pt \the\jlreq@tempdimb\space 0pt \the\jlreq@tempdimb}% - \@tempcnta=4\relax - \@whilenum\@tempcnta<\@tempcntb\do{% - \edef\jlreq@parshapearg{\jlreq@parshapearg\space 0pt \the\linewidth\space 0pt \the\linewidth}% - \advance\@tempcnta by 2\relax - }% - \setlength{\jlreq@tempdimc}{\dimexpr\jlreq@tempdimc - \jlreq@tempdimb - \linewidth * \numexpr(\@tempcntb - 4)/2\relax\relax}% - \else - \def\jlreq@parshapearg{}% - \fi - % 行数を伸ばしつつ良いところを探していく - \@whilenum\@tempcntb<1001\do{% - \ifnum\@tempcntb>2\jlreq@tempdimb=\linewidth\fi - \edef\@tempb{\the\@tempcntb}% - \jlreq@inlinenote@determinelength{#1}{\jlreq@inlinenote@fontsize}{\jlreq@parshapearg}{2}{\@tempb}{\jlreq@tempdimc}{\jlreq@tempdimb}% - \@tempcntb=\@tempb - \ifnum\@tempcntb>999\relax% ループが長すぎる - \global\setbox\jlreq@resultbox=\voidb@x% - \@tempcntb=1001\relax - \fi - \ifvoid\jlreq@resultbox\else% 成功 - \edef\jlreq@inlinenote@lines{\the\@tempcntb}% 行数を保存 - \@tempcntb=1001\relax - \fi - \advance\@tempcntb by 2\relax - \edef\jlreq@parshapearg{\jlreq@parshapearg 0pt \the\jlreq@tempdimb 0pt \the\jlreq@tempdimb}% - }% - \ifvoid\jlreq@resultbox - \ClassWarning{jlreq}{\string\warichu\space failed, may be a bug}% - \else - \@tempcnta=0 - \splittopskip=0pt\relax - \splitmaxdepth=\maxdimen - % 現在行の残り長さを思い出す - \jlreq@tempdimb=\jlreq@rest@linewidth - \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（\inhibitglue}% - \addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}% - \setbox\@tempboxa=\box\jlreq@resultbox - \@whilenum\@tempcnta<\jlreq@inlinenote@lines\do{% - \ifnum\@tempcnta>0 \jlreq@inlinenote@autolinebreak\fi - % \jlreq@tempdimaに今の行の長さを入れる - \ifnum\@tempcnta<\numexpr\jlreq@inlinenote@lines - 2\relax - \ifnum\@tempcnta=0\jlreq@tempdima=\jlreq@tempdimb - \else\jlreq@tempdima=\linewidth\fi - \else - % 最終行は自然長に任せる - \jlreq@tempdima=-1pt\relax - \fi - {% - \edef\@tempa{\the\vbadness}% - \vbadness=10000 - \setbox\jlreq@tempboxa=\vsplit\@tempboxa to \dimexpr\jlreq@inlinenote@baselineskip*2\relax - \vbadness=\@tempa\relax - \jlreq@getlastbox{\jlreq@tempboxa}% - \setbox\jlreq@tempboxb=\box\jlreq@resultbox - \jlreq@getlastbox{\jlreq@tempboxa}% - \setbox\jlreq@tempboxa=\box\jlreq@resultbox - \ifdim\jlreq@tempdima>0pt\relax - \setbox\jlreq@tempboxa=\vbox{\jlreq@inlinenote@fontsize - \hbox to \jlreq@tempdima{\unhbox\jlreq@tempboxa}% - \hbox to \jlreq@tempdima{\unhbox\jlreq@tempboxb}}% - \else - \setbox\jlreq@tempboxa=\vbox{\jlreq@inlinenote@fontsize - \hbox{\unhbox\jlreq@tempboxa}% - \hbox{\unhbox\jlreq@tempboxb}}% - \fi - \jlreq@box@putcenter\jlreq@tempboxa - }% - \advance\@tempcnta by 2\relax - }% - \fi - \jlreq@inlinenote@endnote -} - -\newcommand*{\jlreq@inlinenote@noauto}[1]{% - \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（}% - \inhibitglue\jlreq@box@putcenter\jlreq@tempboxa - \jlreq@inlinenote@noauto@#1\\\jlreq@endmark\jlreq@endmark - \jlreq@inlinenote@endnote -} - -\def\jlreq@inlinenote@noauto@#1\\#2#3\jlreq@endmark{% - \jlreq@inlinenote@noauto@@#1&\jlreq@endmark\jlreq@endmark - \jlreq@ifendmark{#2}{}{\linebreak\jlreq@inlinenote@noauto@#2#3\jlreq@endmark}% -} - -\def\jlreq@inlinenote@noauto@@#1#3\jlreq@endmark{% - \jlreq@ifendmark{#2}{% - \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize #1}% - \jlreq@tempdimc=\wd\@tempboxa - \divide\jlreq@tempdimc by 2\relax - \jlreq@inlinenote@determinelength{#1}{\jlreq@inlinenote@fontsize}{}{2}{2}{\jlreq@tempdimc}{\maxdimen}% - \ifvoid\jlreq@resultbox\else - {% - \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@fontsize\box\jlreq@resultbox}% - \jlreq@box@putcenter\jlreq@tempboxa - }% - \fi - \def\jlreq@next{}% - }{% - \def\jlreq@next{\jlreq@inlinenote@noauto@@@{#1}#2#3}% - }% - \jlreq@next -} - -\def\jlreq@inlinenote@noauto@@@#1#2&\jlreq@endmark{% - \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize\vbox{\hbox{#1}\hbox{#2}}}% - \jlreq@box@putcenter\@tempboxa -} - -\newcommand{\jlreq@inlinenote@endnote}{% - \jlreq@in@inlinenotefalse - {% - \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize）}% - \jlreq@box@putcenter\jlreq@tempboxa - \inhibitglue - }% -} - -% \jlreq@inlinenote@determinelength{テキスト(1)}{フォントとか指定(2)}{\parshape指定(3)}{調整に使う行数(4)}{成功行数(5)}{最小長さ(6)}{最大長さ(7)} -% 次を満たす長さXの最小値を求める（ただし#6 <= X <= #7） -% #1を -% * #5 - #4行目までは#3の指定に従う -% * それ以降はX -% として整形した際に，#5行以内に収まる． -% \jlreq@resultboxに整形結果を返す（垂直ボックス）．見つからなかったらvoid．\globalに設定する． -\newcommand{\jlreq@inlinenote@determinelength}[7]{% -% \message{#1 の試行開始，行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relaxまで}% - \@tempcnta=1\relax - \def\@tempa{}% - % 調整に使う行の\parshape指定を\@tempaに入れる．長さは\jlreq@tempdima． - \@whilenum\@tempcnta<#4\do{% - \expandafter\def\expandafter\@tempa\expandafter{\@tempa 0pt \the\jlreq@tempdima}% - \advance\@tempcnta by 1\relax - }% - \@tempcnta=0 - \jlreq@tempdima=#6\relax - % \jlreq@tempdimaを少しずつ伸ばしていく - \@whilenum\@tempcnta<1000\do{% - \ifnum\@tempcnta>999\relax% ループが長すぎる - \global\setbox\jlreq@resultbox=\voidb@x% - \@tempcnta=1001\relax - \else - \setbox\@tempboxa=\vbox{#2% - \vbadness=10000\hbadness=10000\vfuzz=\maxdimen\hfuzz=\maxdimen - \parindent=0pt\leftskip=0pt\rightskip=0pt - \parshape #5 #3 \@tempa 0pt \the\maxdimen - #1\par\global\@tempcntb=\prevgraf}% -% \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行，行数は\the\@tempcntb , 書式 #5 #3 \@tempa 0pt \the\maxdimen}% - \fi - \jlreq@getlastbox{\@tempboxa}% - \setbox\jlreq@tempboxa=\box\jlreq@resultbox - \ifnum\@tempcntb<#5\relax% 行数が達していないならOK -% \message{行数 = \the\@tempcntb により確定} - % #5行になるまで空の水平ボックスを加えていく． - \global\setbox\jlreq@resultbox=\vbox{#2% - \unvbox\@tempboxa\hbox{\unhbox\jlreq@tempboxa\unskip\unskip\unpenalty}% - \@whilenum\@tempcntb<#5\do{\hbox{}\advance\@tempcntb by 1}}% - \@tempcnta=1001\relax - \else - % そうでない場合は最後の二行の長さを比較する - \jlreq@getlastbox{\@tempboxa}% - \setbox\jlreq@tempboxb=\box\jlreq@resultbox -% \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}% - \ifdim\wd\jlreq@tempboxa>\wd\jlreq@tempboxb - \advance\jlreq@tempdima by 0.3pt\relax% 0.3ptに意味はない - \else - % 後ろが短いのでOK - \global\setbox\jlreq@resultbox=\vbox{#2\unvbox\@tempboxa\box\jlreq@tempboxb\box\jlreq@tempboxa}% - \jlreq@resultdimen=\jlreq@tempdima - \@tempcnta=1001\relax - \fi - \fi - \ifdim\jlreq@tempdima>#7\relax - \global\setbox\jlreq@resultbox=\box\voidb@x - \@tempcnta=1001\relax - \fi - \advance\@tempcnta by 1\relax - }% -} - -%. ページスタイル． -% メモ： -% 2.6.1.cの後半が前半と整合的でないように見える…… -% 柱：両柱と片柱（2.6.3） -\@tempdima=\jlreq@speciallength{\jlreq@headfoot@sidemargin} -\ifthenelse{\lengthtest{\@tempdima=0pt} \OR \(\lengthtest{0.99\zw < \@tempdima} \AND \lengthtest{\@tempdima < 1.01\zw}\)}{}{ - \jlreq@note{ノンブルまたは柱は，基本版面の左右にそろえるか，全角アキだけ寄せた位置に配置する (2.6.1.b)．} -} - -% bottom-leftみたいなのを解釈する．入力の順番はどっちでも良いが，出力はの順番 -% #1 = bottom-leftみたいなのを{bottom}{left}に変換し，#2に代入，#3はデフォルト値，出力形式で入れる -\newcommand*{\jlreq@pagestyle@parse@position}[3]{% - \begingroup - \jlreq@pagestyle@parse@position@#1-\jlreq@endmark - % \jlreq@tempcに縦方向を，\jlreq@tempdに横方向を入れる - \def\jlreq@tempc{}\def\jlreq@tempd{}% - \jlreq@pagestyle@parse@position@@{\jlreq@tempa}% - \jlreq@pagestyle@parse@position@@{\jlreq@tempb}% - \ifx\jlreq@tempc\@empty\edef\jlreq@tempc{\expandafter\@firstoftwo#3}\fi - \ifx\jlreq@tempd\@empty\edef\jlreq@tempd{\expandafter\@secondoftwo#3}\fi - \edef\jlreq@do{\unexpanded{\def#2}{{\jlreq@tempc}{\jlreq@tempd}}}% - \expandafter\endgroup - \jlreq@do -} - -\def\jlreq@pagestyle@parse@position@#1-#2\jlreq@endmark{% - \def\jlreq@tempa{#1}\def\jlreq@tempb{#2}% - \jlreq@ifempty{#2}{% - \ifx\jlreq@tempb\@empty\ClassError{jlreq}{Invalid position: #1}{\@ehc}\fi - }{% - \def\@tempa##1-{\def\jlreq@tempb{##1}}% - \@tempa#2\relax - }% -} - -\newcommand*\jlreq@pagestyle@parse@position@@[1]{% - \jlreq@switch{#1}{ - {top}{\def\jlreq@tempc{#1}} - {bottom}{\def\jlreq@tempc{#1}} - {left}{\def\jlreq@tempd{#1}} - {right}{\def\jlreq@tempd{#1}} - {center}{\def\jlreq@tempd{#1}} - {gutter}{\if@tate\def\jlreq@tempd{right}\else\def\jlreq@tempd{left}\fi} - {fore_edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi} - {\ClassError{jlreq}{Invalid position: #1}{\@ehc}} - }% -} - -% レベル#1より低いレベルの見出しの**markを\markboth{}{}にする -\def\jlreq@pagestyle@setclearmark#1{% - \@for\@tempa:=\jlreq@heading@allheadings\do{% - \@ifundefined{\@tempa}{}{% - \ifnum\csname jlreq@heading@level@\@tempa\endcsname<#1\relax\expandafter\def\csname\@tempa mark\endcsname##1{\markboth{}{}}\fi - }% - }% -} - -% odd_running_head=_sectionのように下線から始まる場合，その値の見出し命令を柱に出すようにする． -% 要するに\ps@***に\sectionmarkを定義するように仕込む． -% 常にodd=rightmark，even=leftmarkになる． -% 場所指定は奇数ページの方．偶数ページは反対になる． -% mark_format={_chapter={第\thechapter 章\quad #1}}のような形． -% このとき\ps@***で\def\chaptermark#1{\markboth{第\thechapter 章\quad #1}{}}とか定義される． -% \markbothか\markrightかはoddかevenかに依存． -% odd=とかeven=とかも仕込めるようにしたけど -% あまり意味がない気がしてきた．oddやevenが優先される． -\newcommand*{\DeclarePageStyle}[2]{% - \expandafter\edef\csname jlreq@pagestyle@setting@#1\endcsname{\unexpanded{#2}}% - \begingroup - \def\jlreq@nombre@position{}% - \def\jlreq@running@head@position{}% - \def\jlreq@nombre{\thepage}% - \def\jlreq@odd@running@head{}% - \def\jlreq@even@running@head{}% - \def\jlreq@command{}% - \def\jlreq@mark@format{}% - \def\jlreq@font{}% - % 柱とノンブルの間 - \def\jlreq@gap{1.5\zw}% - \newif\ifjlreq@clearmarkcommand\jlreq@clearmarkcommandtrue - \newif\ifjlreq@pstate\jlreq@pstatefalse % PageStyleTATE - \jlreq@parsekeyval[PageStyle:#1]{ - *{tate}{\jlreq@pstatetrue} - *{yoko}{\jlreq@pstatefalse} - {nombre_position}{\def\jlreq@nombre@position{##1}} - {running_head_position}{\def\jlreq@running@head@position{##1}} - {nombre}{\def\jlreq@nombre{##1}} - {odd_running_head}{\def\jlreq@odd@running@head{##1}} - {even_running_head}{\def\jlreq@even@running@head{##1}} - {font}{\def\jlreq@font{##1}} - {mark_format}{\edef\jlreq@mark@format{\unexpanded{##1}}} - {command}{\edef\jlreq@command{\unexpanded{##1}}} - {gap}{\def\jlreq@gap{##1}} - % trueにすると，\ps@***実行時にまず\***markを全て\@gobbleにする． - {clear_markcommand}[true,false]{\csname jlreq@clearmarkcommand##1\endcsname} - }{#2}% - \def\jlreq@markdefinition{}% - % \jlreq@makemark{odd/even}running_headの中身\jlreq@endmark\jlreq@endmark - % として使う．running_headの中身が_から始まる時に，次を実行する． - % * \jlreq@[even/odd]@running@headを\leftmarkや\rightmarkに書き換える - % * \jlreq@markdefinitionに\***markを定義するマクロを入れる． - % * \jlreq@[even/odd]@running@head@levelに見出しのレベルを入れる． - \def\jlreq@makemark##1##2##3\jlreq@endmark{% - \ifx_##2% - \@ifundefined{##2}{% - \ClassError{jlreq}{Unknown Heading `##2' (in PageStyle #1)}{\@ehc}% - }{}% - \ifthenelse{\equal{##1}{even}}{% - \def\jlreq@even@running@head{\leftmark}% - }{% - \def\jlreq@odd@running@head{\rightmark}% - }% - \@ifundefined{jlreq@heading@setting@##3}{}{% - \expandafter\edef\csname jlreq@##1@running@head@level\endcsname{\csname jlreq@heading@level@##3\endcsname}% - }% - % mark_formatを調べる - \def\jlreq@tempa####1{% - \jlreq@tempafalse - \edef\jlreq@result{\expandonce{\csname the##3\endcsname}\noexpand\quad\unexpanded{########1}}% - \jlreq@parsekeyval*{ - {##1}{\edef\jlreq@result{\unexpanded{########1}}\jlreq@tempatrue} - {##2##3}{\ifjlreq@tempa\else\edef\jlreq@result{\unexpanded{########1}}\fi} - }{####1}% - }% - \expandafter\jlreq@tempa\expandafter{\jlreq@mark@format}% - \ifthenelse{\equal{##1}{even}}{% - \def\jlreq@markcommand{\markboth}% - \def\jlreq@markcommandafter{{}}% - }{% - \def\jlreq@markcommand{\markright}% - \def\jlreq@markcommandafter{}% - }% - \eappto\jlreq@markdefinition{% - \noexpand\def\expandonce{\csname ##3mark\endcsname}\unexpanded{####1}{\expandonce{\jlreq@markcommand}% - {\expandonce{\jlreq@result}}\expandonce{\jlreq@markcommandafter}}% - }% - \fi - \jlreq@ifendmark{##2}{}{\@gobble}% - }% - \def\jlreq@even@running@head@level{}% - \def\@tempb{\jlreq@makemark{even}}% - \expandafter\@tempb\jlreq@even@running@head\jlreq@endmark\jlreq@endmark - \def\jlreq@odd@running@head@level{}% - \def\@tempb{\jlreq@makemark{odd}}% - \expandafter\@tempb\jlreq@odd@running@head\jlreq@endmark\jlreq@endmark - \ifx\jlreq@odd@running@head@level\@empty\else\ifx\jlreq@even@running@head@level\@empty\else - \ifnum\jlreq@odd@running@head@level<\jlreq@even@running@head@level - % 見出しを出す場合：evenに章などの高いレベルの見出しを出す（2.6.3.a） - \jlreq@note{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる (ページスタイル #1内，2.6.3.a)．}% - \fi - \fi\fi - % \jlreq@tempa = min{\jlreq@odd@running@head@level,\jlreq@even@running@head@level} - \let\jlreq@tempa=\jlreq@odd@running@head@level - \ifx\jlreq@tempa\@empty - \let\jlreq@tempa=\jlreq@even@running@head@level - \else - \ifx\jlreq@even@running@head@level\@empty\else\ifnum\jlreq@tempa>\jlreq@even@running@head@level - \let\jlreq@tempa=\jlreq@even@running@head@level - \fi\fi - \fi - \ifx\jlreq@tempa\@empty\else - \eappto\jlreq@markdefinition{\noexpand\jlreq@pagestyle@setclearmark{\expandonce{\jlreq@tempa}}}% - \fi - % \jlreq@[even/odd][head/foot]に入れていく．tateか否かで場合分け． - \ifjlreq@pstate\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% - \ifx\jlreq@nombre@position\@empty\def\jlreq@nombre@position{0pt}\fi - \ifx\jlreq@running@head@position\@empty\def\jlreq@running@head@position{0pt}\fi - \if@tate\else - \jlreq@note{ノンブルおよび柱を縦組にして配置するのは縦組の場合のみである (ページスタイル #1 内，2.6.1)．}% - \fi - % 柱とノンブルを入れる箱を作る（\jlreq@resultを展開すると\setboxするマクロがでる） - \def\jlreq@make@tatebox##1{% - \edef\jlreq@result{% - \unexpanded{\setbox\jlreq@tempboxa=\hbox to }% - \unexpanded{\dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{ - \topskip + 1\zh}\fi\noexpand\relax - {\unexpanded{\tate\adjustbaseline}% - \ifx##1\@empty\else - \noexpand\hspace{\unexpanded{\dimexpr\headsep + \headheight + }% - \if@tate\else\unexpanded{\topskip - \Cht + }\fi - \expandonce{\jlreq@running@head@position}\noexpand\relax}% - \expandonce{##1}% - \fi - \ifx\jlreq@nombre\@empty\else - \noexpand\hfill - \expandonce{\jlreq@nombre}% - \ifdim\dimexpr\jlreq@nombre@position\relax=0pt\else - \unexpanded{\hspace{\dimexpr\jlreq@nombre@position\relax}}% - \fi - \fi - }% - % Overfull防止 - \ifx l\jlreq@engine - \unexpanded{\wd\jlreq@tempboxa=\headheight}% - \else - \unexpanded{\ht\jlreq@tempboxa=\headheight\dp\jlreq@tempboxa=0pt}% - \fi - }% - }% - % 左に配置するヘッダ．##1は柱の中身を入れたマクロ．（一回展開で正しくでてくる．） - \def\jlreq@make@lefthead##1{% - \jlreq@make@tatebox{##1}% - \edef\jlreq@lefthead{% - \expandonce{\jlreq@result}% - \noexpand\hspace{\noexpand\dimexpr - \if@tate\unexpanded{-\Cdp}\fi - \unexpanded{\headsep - 1\zw}% - \noexpand\relax}% - \unexpanded{\box\jlreq@tempboxa\hfil}% - }% - }% - % 右に配置するヘッダ． - \def\jlreq@make@righthead##1{% - \jlreq@make@tatebox{##1}% - \edef\jlreq@righthead{% - \expandonce{\jlreq@result}% - \noexpand\hspace{\unexpanded{\dimexpr\textwidth} - \if@tate\unexpanded{- \topskip + \Cht}\fi - \unexpanded{ + \headsep}% - \noexpand\relax}% - \unexpanded{\box\jlreq@tempboxa\hss}% - }% - }% - \if@tate - \jlreq@make@lefthead{\jlreq@odd@running@head}% - \let\jlreq@oddhead=\jlreq@lefthead - \jlreq@make@righthead{\jlreq@even@running@head}% - \let\jlreq@evenhead=\jlreq@righthead - \else - \jlreq@make@righthead{\jlreq@odd@running@head}% - \let\jlreq@oddhead=\jlreq@righthead - \jlreq@make@lefthead{\jlreq@even@running@head}% - \let\jlreq@evenhead=\jlreq@lefthead - \fi - \let\jlreq@oddfoot=\@empty - \let\jlreq@evenfoot=\@empty - }{% yoko - % \jlreq@nombre@positoinと\jlreq@running@head@positionの中身を{bottom}{center}みたいに変換する． - \ifx\jlreq@nombre@position\@empty\def\jlreq@nombre@position{bottom-center}\fi - \expandafter\jlreq@pagestyle@parse@position\expandafter{\jlreq@nombre@position}{\jlreq@nombre@position}{{bottom}{center}}% - \ifx\jlreq@running@head@position\@empty\def\jlreq@running@head@position{top-center}\fi - \expandafter\jlreq@pagestyle@parse@position\expandafter{\jlreq@running@head@position}{\jlreq@running@head@position}{{top}{center}}% - \ifthenelse{\( - \boolean{@tate} \AND \( - \equal{\expandafter\@secondoftwo\jlreq@nombre@position}{right} \OR - \equal{\expandafter\@secondoftwo\jlreq@running@head@position}{right} - \)\) \OR \( - \(\NOT \boolean{@tate}\) \AND \( - \equal{\expandafter\@secondoftwo\jlreq@nombre@position}{left} \OR - \equal{\expandafter\@secondoftwo\jlreq@running@head@position}{left} - \) - \)}{% - \if@twoside - \jlreq@note{柱やノンブルは，左ページでは，基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか，基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する (ページスタイル #1 内，2.6.1.b)．}% - \fi - }{}% - {\jlreq@font - \ifthenelse{\lengthtest{\jlreq@gap < 1.49\zw} \OR \( \lengthtest{\jlreq@gap > 1.51\zw} \AND \lengthtest{\jlreq@gap < 1.99\zw} \) \OR \lengthtest{\jlreq@gap > 2.01\zw}}{\jlreq@note{ノンブルと柱との空き量は文字サイズの2倍又は1.5倍とする (ページスタイル #1 内，2.6.1.c)．}}{}% - }% - % ##2を##1 = left/center/rightの場所，##4を##3の場所に置く．被った場合は##2を外側にする． - % 戻り値は\jlreq@result - \def\jlreq@setheadfoot##1##2##3##4{% - % 左，真ん中，右に置くもの（対応するものがなければ空）をそれぞれ格納する． - \def\jlreq@left{}\def\jlreq@center{}\def\jlreq@right{}% - % \ifjlreq@tempa = if(##1 == ##3 && ##2 != "" && ##4 != "") - \jlreq@tempatrue - \jlreq@ifempty{##2}{\jlreq@tempafalse}{}% - \jlreq@ifempty{##4}{\jlreq@tempafalse}{}% - \ifthenelse{\equal{##1}{##3}}{}{\jlreq@tempafalse}% - \ifjlreq@tempa - \ifthenelse{\equal{##1}{right}}{% - \edef\jlreq@right{\unexpanded{##4}\noexpand\hspace{\expandonce{\jlreq@gap}}\unexpanded{##2}}% - }{% - \expandafter\edef\csname jlreq@##1\endcsname{\unexpanded{##2}\noexpand\hspace{\expandonce{\jlreq@gap}}\unexpanded{##4}}% - }% - \else - \jlreq@ifempty{##2}{}{\expandafter\def\csname jlreq@##1\endcsname{##2}}% - \jlreq@ifempty{##4}{}{\expandafter\def\csname jlreq@##3\endcsname{##4}}% - \fi - % フォント命令を挿入 - \ifx\jlreq@font\@empty\else - \ifx\jlreq@left\@empty\else\edef\jlreq@left{{\expandonce{\jlreq@font}\expandonce{\jlreq@left}}}\fi - \ifx\jlreq@center\@empty\else\edef\jlreq@center{{\expandonce{\jlreq@font}\expandonce{\jlreq@center}}}\fi - \ifx\jlreq@right\@empty\else\edef\jlreq@right{{\expandonce{\jlreq@font}\expandonce{\jlreq@right}}}\fi - \fi - % \jlreq@setheadfoot@に回して処理 - \edef\jlreq@do{\noexpand\jlreq@setheadfoot@{\expandonce{\jlreq@left}}{\expandonce{\jlreq@center}}{\expandonce{\jlreq@right}}}% - \jlreq@do - }% - % ##1 ##2 ##3と並んだヘッダを作る，戻り値は\jlreq@result - \def\jlreq@setheadfoot@##1##2##3{% - % - \Cdpは端にそろえるための補正 - \jlreq@ifempty{##1}{\def\jlreq@left{}}{\edef\jlreq@left{\noexpand\hspace{\dimexpr\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate - \Cdp\fi\relax}\unexpanded{##1}}}% - % +\topskip - \Chtは\jlreq@headfoot@sidemargin = 0ptの時に本文の右に一致させるための補正． - \jlreq@ifempty{##3}{\def\jlreq@right{}}{\edef\jlreq@right{\unexpanded{##3}\noexpand\hspace{\dimexpr\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate + \topskip - \Cht\fi\relax}}}% - \jlreq@ifempty{##2}{% - \edef\jlreq@result{\expandonce{\jlreq@left}\hfil\expandonce{\jlreq@right}}% - \jlreq@ifempty{##1}{\jlreq@ifempty{##3}{\def\jlreq@result{}}{}}{}% - }{% - \ifx\jlreq@left\@empty\else\edef\jlreq@left{\noexpand\hbox to 0pt{\expandonce{\jlreq@left}\hss}}\fi - \ifx\jlreq@right\@empty\else\edef\jlreq@right{\noexpand\hbox to 0pt{\hss\expandonce{\jlreq@right}}}\fi - \edef\jlreq@result{\expandonce{\jlreq@left}\hfil\unexpanded{##2}\hfil\expandonce{\jlreq@right}}% - }% - }% - % \nombre@を定義 - \def\jlreq@nombre@top{}\def\jlreq@nombre@bottom{}% - \expandafter\edef\csname jlreq@nombre@\expandafter\@firstoftwo\jlreq@nombre@position\endcsname{\expandonce{\jlreq@nombre}}% - % \odd@running@head@を定義 - \def\jlreq@odd@running@head@top{}\def\jlreq@odd@running@head@bottom{}% - \expandafter\edef\csname jlreq@odd@running@head@\expandafter\@firstoftwo\jlreq@running@head@position\endcsname{\expandonce{\jlreq@odd@running@head}}% - % \@oddheadを定義 - \edef\jlreq@do{\noexpand\jlreq@setheadfoot{\expandafter\@secondoftwo\jlreq@nombre@position}{\expandonce{\jlreq@nombre@top}}{\expandafter\@secondoftwo\jlreq@running@head@position}{\expandonce{\jlreq@odd@running@head@top}}}% - \jlreq@do\let\jlreq@oddhead=\jlreq@result - % \@oddfootを定義 - \edef\jlreq@do{\noexpand\jlreq@setheadfoot{\expandafter\@secondoftwo\jlreq@nombre@position}{\expandonce{\jlreq@nombre@bottom}}{\expandafter\@secondoftwo\jlreq@running@head@position}{\expandonce{\jlreq@odd@running@head@bottom}}}% - \jlreq@do\let\jlreq@oddfoot=\jlreq@result - % ##1 = {}{}の後ろを逆にする - \def\getoppositeposition##1{% - \jlreq@switch{\expandafter\@secondoftwo##1}{ - {center}{\def\jlreq@tempe{center}} - {right}{\def\jlreq@tempe{left}} - {left}{\def\jlreq@tempe{right}} - }% - \edef##1{{\expandafter\@firstoftwo##1}{\jlreq@tempe}}% - }% - \getoppositeposition\jlreq@nombre@position - \getoppositeposition\jlreq@running@head@position - % 上と同じことをする - % \nombre@を定義 - \def\jlreq@nombre@top{}\def\jlreq@nombre@bottom{}% - \expandafter\edef\csname jlreq@nombre@\expandafter\@firstoftwo\jlreq@nombre@position\endcsname{\expandonce{\jlreq@nombre}}% - % \even@running@head@を定義 - \def\jlreq@even@running@head@top{}\def\jlreq@even@running@head@bottom{}% - \expandafter\edef\csname jlreq@even@running@head@\expandafter\@firstoftwo\jlreq@running@head@position\endcsname{\expandonce{\jlreq@even@running@head}}% - % \@evenheadを定義 - \edef\jlreq@do{\unexpanded{\jlreq@setheadfoot{\expandafter\@secondoftwo\jlreq@nombre@position}}{\expandonce{\jlreq@nombre@top}}\unexpanded{{\expandafter\@secondoftwo\jlreq@running@head@position}}{\expandonce{\jlreq@even@running@head@top}}}% - \jlreq@do\let\jlreq@evenhead=\jlreq@result - % \@evenfootを定義 - \edef\jlreq@do{\unexpanded{\jlreq@setheadfoot{\expandafter\@secondoftwo\jlreq@nombre@position}}{\expandonce{\jlreq@nombre@bottom}}\unexpanded{{\expandafter\@secondoftwo\jlreq@running@head@position}}{\expandonce{\jlreq@even@running@head@bottom}}}% - \jlreq@do\let\jlreq@evenfoot=\jlreq@result - }% - % 傍注がある場合はその分を調整 - % \hbox to ***{+++}というのがあるが，+++は空でなければ\hfillを含むのでUndefullすることはない． - \ifdim\marginparwidth>0pt \ifjlreq@pstate\else - \if@tate - \def\jlreq@do##1{% - \ifx##1\@empty\else - \edef##1{% - \unexpanded{\raise-\dimexpr\marginparwidth+\marginparsep\relax\hbox to \textwidth}{\expandonce{##1}}% - }% - \fi - }% - \jlreq@do\jlreq@oddfoot - \jlreq@do\jlreq@evenfoot - \else - \if@twocolumn - \def\jlreq@do##1{% - \ifx##1\@empty\else - \edef##1{% - \unexpanded{\hspace*{-\dimexpr\marginparwidth+\marginparsep\relax}}% - \noexpand\hbox to \unexpanded{\dimexpr\textwidth + 2\marginparwidth + 2\marginparsep\relax}{\expandonce{##1}}% - \unexpanded{\hspace*{-\dimexpr\marginparwidth+\marginparsep\relax}}% - }% - \fi - }% - \jlreq@do\jlreq@oddhead - \jlreq@do\jlreq@oddfoot - \jlreq@do\jlreq@evenhead - \jlreq@do\jlreq@evenfoot - \else - % 奇数ページ - \def\jlreq@do##1{% - \ifx##1\@empty\else - \edef##1{% - \noexpand\hbox to \unexpanded{\dimexpr\textwidth + \marginparwidth + \marginparsep\relax}{\expandonce{##1}}% - \unexpanded{\hspace*{-\dimexpr\marginparwidth+\marginparsep\relax}}% - }% - \fi - }% - \jlreq@do\jlreq@oddhead - \jlreq@do\jlreq@oddfoot - % 偶数ページ - \def\jlreq@do##1{% - \ifx##1\@empty\else - \edef##1{% - \unexpanded{\hspace*{-\dimexpr\marginparwidth+\marginparsep\relax}}% - \noexpand\hbox to \unexpanded{\dimexpr\textwidth + \marginparwidth + \marginparsep\relax}{\expandonce{##1}}% - }% - \fi - }% - \jlreq@do\jlreq@evenhead - \jlreq@do\jlreq@evenfoot - \fi - \fi - \fi\fi - \edef\jlreq@do{% - \noexpand\def\expandonce{\csname ps@#1\endcsname}{% - \unexpanded{\def\jlreq@current@pagestyle{#1}}% - \ifjlreq@clearmarkcommand\unexpanded{\jlreq@heading@execmacro@toallheadings\jlreq@clearheadingmarks}\fi - \unexpanded{\let\@mkboth=\markboth}% - \unexpanded{\def\@oddhead}{\expandonce{\jlreq@oddhead}}% - \unexpanded{\def\@oddfoot}{\expandonce{\jlreq@oddfoot}}% - \unexpanded{\def\@evenhead}{\expandonce{\jlreq@evenhead}}% - \unexpanded{\def\@evenfoot}{\expandonce{\jlreq@evenfoot}}% - }% - % \jlreq@markdefinition/\jlreq@commandは引数トークンを持つ可能性がある - \noexpand\edef\expandonce{\csname ps@#1\endcsname}{% - \noexpand\csexpandonce{ps@#1}% - \noexpand\unexpanded{% - \expandonce{\jlreq@markdefinition}% - \expandonce{\jlreq@command}% - }% - }% - }% - \expandafter\endgroup - \jlreq@do -} - -\newcommand*{\NewPageStyle}[2]{% - \expandafter\@ifdefinable\csname ps@#1\endcsname{\DeclarePageStyle{#1}{#2}}% -} -\newcommand*{\RenewPageStyle}[2]{% - \@ifundefined{ps@#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclarePageStyle{#1}{#2}}% -} -\newcommand*{\ProvidePageStyle}[2]{% - \@ifundefined{ps@#1}{\DeclarePageStyle{#1}{#2}}{}% -} -\newcommand*{\ModifyPageStyle}[2]{% - \begingroup - \@ifundefined{jlreq@pagestyle@setting@#1}{\ClassError{jlreq}{Unknown pagestyle: #1}{\@ehc}}{}% - \expandafter\let\expandafter\setting\expandafter=\csname jlreq@pagestyle@setting@#1\endcsname - \edef\jlreq@do{\noexpand\RenewPageStyle{#1}{\expandonce{\setting},\unexpanded{#2}}}% - \expandafter\endgroup - \jlreq@do -} - -%.. 各種定義 -\RenewPageStyle{empty}{nombre={},odd_running_head={},even_running_head={}} -\ifthenelse{\equal{\jlreq@article@type}{article}}{ - \if@twoside - \NewPageStyle{headings}{odd_running_head={_subsection},even_running_head={_section}} - \else - \NewPageStyle{headings}{odd_running_head={_section},even_running_head={}} - \fi -}{% book, article - \if@twoside - \NewPageStyle{headings}{odd_running_head={_section},even_running_head={_chapter}} - \else - \NewPageStyle{headings}{odd_running_head={_chapter},even_running_head={}} - \fi - \ModifyPageStyle{headings}{mark_format={_chapter={第\thechapter 章\quad #1}}} -} -\if@tate - \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},clear_markcommand=false} - \NewPageStyle{myheadings}{nombre=\thepage,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false} - \if@twoside - \ModifyPageStyle{plain}{nombre_position={top-left}} - \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-left,running_head_position=top-left} - \ModifyPageStyle{myheadings}{nombre_position=bottom-left,running_head_position=top-left} - \else - \ModifyPageStyle{plain}{nombre_position={top-center}} - \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center} - \ModifyPageStyle{myheadings}{nombre_position=bottom-center,running_head_position=top-center} - \fi -\else% yoko - \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},nombre_position={bottom-center},clear_markcommand=false} - \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center} - \NewPageStyle{myheadings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false} -\fi -\ModifyPageStyle{plain}{font=\small} -\ModifyPageStyle{headings}{font=\small} -\ModifyPageStyle{myheadings}{font=\small} - -%. フロート関連 -% 4.3.3.dの例，縦組みの時だけど横にも適用…… -\setlength{\floatsep}{1\jlreq@gol plus 1\jlreq@gol} -\setlength{\textfloatsep}{1\jlreq@gol plus \baselineskip} -\intextsep=\textfloatsep -\dblfloatsep=\floatsep -\dbltextfloatsep=\textfloatsep -% 残りはデフォルトにしておく． - -% 4.3.1 注4 -\newlength\abovecaptionskip -\newlength\belowcaptionskip -\newcommand{\@makecaption}[2]{{% - \reset@font\small - \vskip\abovecaptionskip - \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\expandonce{\jlreq@makecaption@label@format}}}% - \jlreq@do - \jlreq@ifempty{#1}{}{% - \edef\jlreq@tempa{{\noexpand\jlreq@@makecaption@label@font\expandonce{\jlreq@tempa{#1}}\unexpanded{\hskip \glueexpr\jlreq@makecaption@after@label@space\relax}}}% - }% - \appto\jlreq@tempa{{\jlreq@@makecaption@font #2}}% - \setbox\@tempboxa=\hbox{\jlreq@tempa}% - \@ifundefined{@currenvir}{% - \@ifundefined{@captype}% - {\def\jlreq@tempb{}}% - {\let\jlreq@tempb=\@captype}% - }{\let\jlreq@tempb=\@currenvir}% - \@ifundefined{jlreq@caption@align@\jlreq@tempb}% - {\let\jlreq@align=\jlreq@caption@align}% - {\expandafter\let\expandafter\jlreq@align\csname jlreq@caption@align@\jlreq@tempb\endcsname}% - \ifdim\wd\@tempboxa>\hsize\relax - {% - \ifx c\jlreq@align\centering\fi - \ifx r\jlreq@align\raggedleft\fi - \jlreq@tempa\par - }% - \else - \global\@minipagefalse - \hbox to\hsize{% - \ifnum0\ifx c\jlreq@align 1\fi\ifx r\jlreq@align 1\fi>0 \hfil\fi - \unhbox\@tempboxa - \ifnum0\ifx c\jlreq@align 1\fi\ifx l\jlreq@align 1\fi>0 \hfil\fi - }% - \fi - \vskip\belowcaptionskip}} -\jlreq@jlreqsetup@add{caption_font}{\def\jlreq@@makecaption@font{#1}} -\jlreq@jlreqsetup@add{caption_label_font}{\def\jlreq@@makecaption@label@font{#1}} -\jlreq@jlreqsetup@add{caption_label_format}{\edef\jlreq@makecaption@label@format{\unexpanded{#1}}} -\jlreq@jlreqsetup@add{caption_after_label_space}{\def\jlreq@makecaption@after@label@space{#1}} -\def\jlreq@caption@setalign#1#2{% - \jlreq@switch{#2}{ - {center}{\let#1=c} - {left}{\let#1=l} - {right}{\let#1=r} - {top}{\let#1=l} - {bottom}{\let#1=r} - }% -} -\jlreq@jlreqsetup@add{caption_align}{% - \jlreq@parsekeyval@nokey{% - \jlreq@ifempty{##1}{}{% - \jlreq@switch{##1}{% - {center}{\let\jlreq@caption@align=c} - {left}{\let\jlreq@caption@align=l} - {right}{\let\jlreq@caption@align=r} - {top}{\let\jlreq@caption@align=l} - {bottom}{\let\jlreq@caption@align=r} - {\expandafter\jlreq@caption@setalign\csname jlreq@caption@align@##1\endcsname{##2}} - }% - }% - }{#1}% -} -\jlreqsetup{caption_font={\sffamily\bfseries},caption_label_font={\sffamily\bfseries},caption_after_label_space=1\zw,caption_label_format={#1},caption_align=center} -% 特に根拠のない値 -\setlength\abovecaptionskip{.5\jlreq@gol} -\setlength\belowcaptionskip{0pt} - -%.. figure環境 -\newcounter{figure} -\ifthenelse{\equal{\jlreq@article@type}{article}}{% - \renewcommand{\thefigure}{\@arabic\c@figure} -}{% - \@addtoreset{figure}{chapter} - \renewcommand{\thefigure}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@figure} -} -\newcommand*{\fps@figure}{h} -\newcommand*{\ftype@figure}{1} -\newcommand*{\ext@figure}{lof} -\newcommand*{\fnum@figure}{\figurename\thefigure} -\newenvironment{figure}{\@float{figure}}{\end@float} -\newenvironment{figure*}{\@dblfloat{figure}}{\end@dblfloat} -\newcommand*{\listfigurename}{図目次} -\newcommand{\figurename}{図} - -%.. table環境 -\newcounter{table} -\ifthenelse{\equal{\jlreq@article@type}{article}}{% - \renewcommand{\thetable}{\@arabic\c@table} -}{% - \@addtoreset{table}{chapter} - \renewcommand{\thetable}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@table} -} -\newcommand*{\fps@table}{h} -\newcommand*{\ftype@table}{2} -\newcommand*{\ext@table}{lot} -\newcommand*{\fnum@table}{\tablename\thetable} -\newenvironment{table}{\@float{table}}{\end@float} -\newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat} -\newcommand{\listtablename}{表目次} -\newcommand{\tablename}{表} - -%. タイトル周り -\newenvironment{titlepage}{% - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse\newpage - \fi - \thispagestyle{empty}% - \setcounter{page}{1}% -}{% - \if@restonecol\twocolumn\else\newpage\fi - \if@twoside\else - \setcounter{page}{1}% - \fi -} - -\if@titlepage - \newcommand{\maketitle}{% - % jarticleとかからあまり変更していない - \begin{titlepage}% - \let\footnotesize\small - \let\footnoterule\relax - \let\footnote\thanks - \null\vfil - \vskip 4\baselineskip - \begin{center}% - {\LARGE \@title \par}% - \vskip\baselineskip% - {\Large - \lineskip .75em% - % 縦書き時には表組み内でも縦書きにするようにする - \if@tate - \let\jlreq@temporary@original@ialign=\ialign - \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}% - \fi - \begin{tabular}[t]{c}% - \@author - \end{tabular}\par}% - \vskip\baselineskip - {\large\@date\par}% - \end{center}\par - \vfil{\centering\@thanks}\vfil\null - \end{titlepage}% - \jlreq@endofmaketitle - } -\else - \newcommand{\maketitle}{% - \par - \begingroup - \renewcommand{\thefootnote}{\fnsymbol{footnote}}% - \renewcommand{\@makefnmark}{\hbox{% - \jlreq@iftdir{\yoko}{}% - \rlap{\@textsuperscript{\normalfont\@thefnmark}}% - }}% - \renewcommand{\jlreq@referencemark@format}[1]{\@makefnmark}% うーん - \if@twocolumn - \ifnum\col@number=\@ne - \@maketitle - \else - \twocolumn[\@maketitle]% - \fi - \else - \newpage - \global\@topnum\z@ - \@maketitle - \fi - % \pagestyle{empty}の時はそのまま． - \ifnum0\ifx\@oddhead\@empty\else1\fi\ifx\@evenhead\@empty\else1\fi>0 - \thispagestyle{plain}% - \fi - \@thanks - \endgroup - \jlreq@endofmaketitle - } -\fi -% いろいろクリアする． -\def\jlreq@endofmaketitle{% - \setcounter{footnote}{0}% - \global\let\thanks\relax - \global\let\maketitle\relax - \global\let\p@thanks\relax - \global\let\@thanks\@empty - \global\let\@author\@empty - \global\let\@date\@empty - \global\let\@title\@empty - \global\let\title\relax - \global\let\author\relax - \global\let\date\relax - \global\let\and\relax -}% -% \vskipを\baselineskipにしてみた． -\def\@maketitle{% - \newpage\null - \vskip 2\baselineskip% - \begin{center}% - {\jlreq@keepbaselineskip{\LARGE}\@title\par}% - \vskip\baselineskip - {\jlreq@keepbaselineskip{\large}% - \lineskip .5\zh - % 縦書き時には表組み内でも縦書きにするようにする - \if@tate - \let\jlreq@temporary@original@ialign=\ialign - \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}% - \fi - \begin{tabular}[t]{c}% - \@author - \end{tabular}% - \par - }% - \ifx\@date\@empty\else - \vskip\baselineskip - {\jlreq@keepbaselineskip{\large}\@date}% - \fi - \end{center}% - \par - \vskip\baselineskip - \ifvoid\jlreq@abstractbox\else\unvbox\jlreq@abstractbox\fi -} - -%.. abstract -\def\jlreq@parhook@abstract{} -\ifthenelse{\equal{\jlreq@article@type}{book}}{}{% article,report - \newbox\jlreq@abstractbox - \newcommand*{\abstractname}{概要} - \if@titlepage - % articleとかjarticleとかと同じ - \newenvironment{abstract}{% - \titlepage - \null\vfil - \@beginparpenalty\@lowpenalty - \begin{center}% - {\sffamily\bfseries\abstractname}% - \@endparpenalty\@M - \end{center}% - \par - }{% - \par\vfil\null\endtitlepage - } - \else - \newenvironment{abstract}{% - \ifnum0\if@twocolumn\else1\fi\ifjlreq@preamble1\fi>0 - \ifjlreq@preamble - \ifx l\jlreq@engine\else - \def\jlreq@parhook@abstract{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}% - \PushPostHook{par}{\jlreq@parhook@abstract}% - \fi - \fi - % とりあえず全部ボックスに入れる． - \global\setbox\jlreq@abstractbox=\vtop\bgroup - \ifjlreq@preamble - % preamble後っぽく振る舞う - \@noskipsecfalse - % \@nodocumentが入っているので一時的に無効化 - \everypar{}% - \fi - \if@twocolumn - \parindent=0pt - \hsize=\textwidth - % 後で\@maketitleとともに呼び出されるときは\twcolumn[***]で呼び出される． - \begin{minipage}[b]{\textwidth}% - \fi - \bgroup - \small - \parindent=1\zw - \begin{center}% - {\sffamily\bfseries\abstractname}% - \end{center}% - \list{}{% - \listparindent\parindent - \itemindent\listparindent - \labelwidth\z@ - \labelsep\z@ - \leftmargin=2\zw - \rightmargin\leftmargin - \@tempdima=1\zw - \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax - \@tempdimc=\@tempdimb - \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima - \ifdim\@tempdimb=\@tempdimc\else\@tempdimb=\dimexpr\@tempdimb - 1\zw\relax\fi - \leftmargin=\dimexpr\leftmargin + (\@tempdimc - \@tempdimb)/2\relax - \rightmargin=\dimexpr\rightmargin + (\@tempdimc - \@tempdimb)/2\relax - \parsep\z@ \@plus.1\zh - }% - \item\relax - \else - \section*{\abstractname}% - \fi - }{% - \ifnum0\if@twocolumn\else1\fi\ifjlreq@preamble1\fi>0 - \endlist - \egroup - \vspace{\baselineskip}% - \if@twocolumn - \end{minipage} - \fi - \egroup - \fi - \ifjlreq@preamble - \ifx l\jlreq@engine\else - \def\jlreq@parhook@abstract{}% - \fi - \else - \unvbox\jlreq@abstractbox - \fi - } - \fi -} -%. 箇条書き．cf. JISX4051 8.4 -% 用語定義型 -\newenvironment{description}{\list{}{% - \setlength{\leftmargin}{0\zw}% 下げない - \setlength{\labelwidth}{0\zw}% - \setlength{\labelsep}{1\zw} -% \addtolength{\leftmargin}{\leftskip}% たぶんこの二行いらない…… -% \addtolength{\leftmargin}{\labelsep}% - \let\makelabel=\descriptionlabel -% 同行じゃない場合はこんな感じ？ -% \let\jlreq@original@@item=\@item -% \def\@item[##1]{\jlreq@original@@item[##1]\mbox{}\par - }}{\endlist} -\newcommand{\descriptionlabel}[1]{\normalfont\sffamily\bfseries #1} - -% enumerateとitemize -% 見出しが一つ上のレベルからどのくらいずれているかを入れる． -% （見出しは2\zwの箱に右/下詰めで入る．） -\setlength\leftmargini{2\zw} -\setlength\leftmarginii{1\zw} -\setlength\leftmarginiii{1\zw} -\setlength\leftmarginiv{1\zw} -\setlength\leftmarginv{1\zw} -\setlength\leftmarginvi{1\zw} - -%.. 箇条書き -\jlreq@jlreqsetup@add{itemization_beforeafter_space}{ - \begingroup - \def\jlreq@do{}% - \def\jlreq@keyvallist{}% - \@for\@tempa:=#1\do{% - \expandafter\jlreq@ifcontains\expandafter{\@tempa}{=}{% - \expandafter\appto\expandafter\jlreq@keyvallist\expandafter{\@tempa,}% - }{% - \@for\@tempb:=i,ii,iii,iv,v,vi\do{% - \eappto\jlreq@do{\noexpand\def\expandonce{\csname jlreq@itemization@beforeafter@space@\@tempb\endcsname}{\expandonce{\@tempa}}}% - }% - }% - }% - \def\jlreq@tempa{% - \jlreq@parsekeyval{% - {i}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@i{####1}}} - {ii}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@ii{####1}}} - {iii}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@iii{####1}}} - {iv}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@iv{####1}}} - {v}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@v{####1}}} - {vi}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@vi{####1}}} - }% - }% - \expandafter\jlreq@tempa\expandafter{\jlreq@keyvallist}% - \expandafter\endgroup - \jlreq@do -} -\jlreq@jlreqsetup@add{itemization_itemsep}{\def\jlreq@itemization@itemsep{#1}} -\jlreqsetup{itemization_beforeafter_space={0pt,i=.5\baselineskip},itemization_itemsep=0pt} -% enumerate, itemize用初期化 -\def\jlreq@init@list{% - \setlength{\labelwidth}{2\zw}% - \setlength{\partopsep}{0pt}% - \setlength{\itemsep}{\dimexpr\jlreq@itemization@itemsep\relax}% - \setlength{\parsep}{0pt}% - \setlength{\listparindent}{\parindent}% -% itemizeは直後ベタ，enumerateは直後全角空き． - \ifthenelse{\equal{\@currenvir}{itemize}}{% - \setlength{\labelsep}{0\zw}% - }{% - \setlength{\labelsep}{1\zw}% - }% - % \labelsepだけあけるのは一つ目（ラベルの直後）のみ - \setlength{\itemindent}{\labelsep}% -} - -\def\@listi{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@i\relax}% - \setlength{\leftmargin}{\leftmargini}% -} -\let\@listI\@listi -\def\@listii{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@ii\relax}% - \setlength{\leftmargin}{\leftmarginii}% -} -\def\@listiii{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@iii\relax}% - \setlength{\leftmargin}{\leftmarginiii}% -} -\def\@listiv{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@iv\relax}% - \setlength{\leftmargin}{\leftmarginiv}% -} -\def\@listv{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@v\relax}% - \setlength{\leftmargin}{\leftmarginv}% -} -\def\@listvi{% - \jlreq@init@list - \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@vi\relax}% - \setlength{\leftmargin}{\leftmarginvi}% -} - -\if@tate - \renewcommand{\theenumi}{\jlreq@Kanji{enumi}} - \renewcommand{\theenumii}{\jlreq@rensuji{\@arabic\c@enumii}} - \renewcommand{\theenumiii}{\jlreq@rensuji{\@arabic\c@enumiii}} - \renewcommand{\theenumiv}{\jlreq@rensuji{\@arabic\c@enumiv}} - \newcommand{\labelenumi}{\theenumi} - \newcommand{\labelenumii}{\theenumii} - \newcommand{\labelenumiii}{\theenumiii} - \newcommand{\labelenumiv}{\theenumiv} -\else - \renewcommand{\theenumi}{\@arabic\c@enumi} - \renewcommand{\theenumii}{\@alph\c@enumii} - \renewcommand{\theenumiii}{\@roman\c@enumiii} - \renewcommand{\theenumiv}{\@Alph\c@enumiv} - \newcommand{\labelenumi}{\theenumi.} - \newcommand{\labelenumii}{(\theenumii)} - \newcommand{\labelenumiii}{\theenumiii.} - \newcommand{\labelenumiv}{\theenumiv.} -\fi -\renewcommand{\p@enumii}{\theenumi} -\renewcommand{\p@enumiii}{\theenumi(\theenumii)} -\renewcommand{\p@enumiv}{\p@enumiii\theenumiii} - -\newcommand{\labelitemi}{\hbox to 1\zw{\hss\textbullet\hss}} -%\newcommand{\labelitemi}{•} -\if@tate - \newcommand{\labelitemii}{○} - \newcommand{\labelitemiii}{＊} -\else - \newcommand{\labelitemii}{\hbox to 1\zw{\hss\textendash\hss}} - \newcommand{\labelitemiii}{\hbox to 1\zw{\hss\textasteriskcentered\hss}} -\fi -\newcommand{\labelitemiv}{\hbox to 1\zw{\hss ・\hss}} - -% 引用系．3.5.2の例． -\jlreq@jlreqsetup@add{quote_indent}{\def\jlreq@quote@indent{#1}} -\jlreq@jlreqsetup@add{quote_end_indent}{\def\jlreq@quote@end@indent{#1}} -\jlreq@jlreqsetup@add{quote_fontsize}[normalsize,small,footnotesize,scriptsize,tiny,]{\jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\expandonce{\csname #1\endcsname}}}} -\jlreq@jlreqsetup@add{quote_beforeafter_space}{\def\jlreq@quote@beforeafter@space{#1}} -\jlreqsetup{quote_indent=2\zw,quote_end_indent=0pt,quote_fontsize=,quote_beforeafter_space=0pt} - -\newenvironment{verse} - {\let\\\@centercr - \list{}{\itemsep\z@ \itemindent -2\jlreq@mol - \listparindent\itemindent - \labelwidth\z@ - \labelsep\z@ - \leftmargin=\dimexpr\jlreq@quote@indent\relax - \addtolength{\leftmargin}{2\jlreq@mol}% - \rightmargin=\dimexpr\jlreq@quote@end@indent\relax - \jlreq@quote@fontsize - \@tempdima=1\zw - \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax - \@tempdimc=\@tempdimb - \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima - \topsep=\dimexpr\jlreq@quote@beforeafter@space\relax - \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax}% - \item\relax}{\endlist} -\newenvironment{quotation} - {\list{}{% - \leftmargin=\dimexpr\jlreq@quote@indent\relax - \rightmargin=\dimexpr\jlreq@quote@end@indent\relax - \jlreq@quote@fontsize - \@tempdima=1\zw - \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax - \@tempdimc=\@tempdimb - \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima - \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax - \listparindent\parindent - \itemindent\listparindent - \labelwidth\z@ - \labelsep\z@ - \topsep=\dimexpr\jlreq@quote@beforeafter@space\relax - \parsep\z@ \@plus.1\jlreq@gol}% - \item\relax}{\endlist} -\newenvironment{quote} - {\list{}{% - \leftmargin=\dimexpr\jlreq@quote@indent\relax - \rightmargin=\dimexpr\jlreq@quote@end@indent\relax - \jlreq@quote@fontsize - \@tempdima=1\zw - \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax - \@tempdimc=\@tempdimb - \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima - \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax - \labelwidth\z@ - \itemindent\z@ - \topsep=\jlreq@speciallength{\jlreq@quote@beforeafter@space}% - \listparindent\z@}% - \item\relax}{\endlist} - -%. 表関係 4.4 -% 表内の行間を0にする（4.4.3.f） -\jlreq@saveoriginalcs{\tabular} -\jlreq@saveoriginalcs{\endtabular} -\preto\tabular{\begingroup\appto\@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}} -\appto\endtabular{\endgroup} -% 4.4.3.e -\setlength\tabcolsep{.5\zh} -\setlength\arraycolsep{.5\zw} -% 4.4.3.j -\setlength\arrayrulewidth{\jlreq@omotekeiwidth} % 4.4.3.c -\setlength\doublerulesep{2pt} -\setlength\tabbingsep{\labelsep} -\skip\@mpfootins=\skip\footins -\setlength\fboxsep{.3\zw} -\setlength\fboxrule{\jlreq@omotekeiwidth} % 根拠はない -% 後で -\ifthenelse{\equal{\jlreq@article@type}{article}}{% - \renewcommand{\theequation}{\@arabic\c@equation} -}{% - \@addtoreset{equation}{chapter} - \renewcommand{\theequation}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@equation} -} - -%. 目次 -\setcounter{tocdepth}{3} -\newcommand{\@pnumwidth}{2\jlreq@mol} -\newcommand{\@tocrmarg}{2.55em} -\newcommand{\@dotsep}{2} % 狭くしてみた -\newskip\toclineskip -\setlength\toclineskip{0\jlreq@gol plus .02\jlreq@gol} -% tarticleから -\newdimen\@lnumwidth -\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} -\def\addcontentsline#1#2#3{% - \protected@write\@auxout{% - \let\label\@gobble\let\index\@gobble\let\glossary\@gobble - \if@tate - \@temptokena{\jlreq@rensuji{\thepage}}% - \else - \@temptokena{\thepage}% - \fi - }{\string\@writefile{#1}{\protect\contentsline{#2}{#3}{\the\@temptokena}}}% -} - -\newcount\jlreq@top@contents % トップ見出しを入れる．レベルと同じ値． -\jlreq@top@contents=-100 -\newcommand*{\jlreq@set@top@contents}[1]{% - \ifnum\jlreq@top@contents=-100 - \jlreq@top@contents=#1\relax - \fi -} -\ifthenelse{\equal{\jlreq@article@type}{article}}{ - \newcommand{\tableofcontents}{% - \jlreq@top@contents=-100\relax - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \section*{\contentsname}% - \@mkboth{\contentsname}{\contentsname}% - \@starttoc{toc}% - \if@restonecol\twocolumn\fi - } -}{% book, report - \newcommand{\tableofcontents}{% - \jlreq@top@contents=-100\relax - \if@twocolumn - \@restonecoltrue\onecolumn - \else - \@restonecolfalse - \fi - \chapter*{\contentsname}% - \@mkboth{\contentsname}{\contentsname}% - \@starttoc{toc}% - \if@restonecol\twocolumn\fi - } -} -% JIS X 4051自身の目次に近づけようかと……なりきれてないけど． -% 文字の大きさは全て同じ（\normalsize）にする． -% 見出しのレベルがあがると1文字分ずつ字下げしていく． -% 第三引数は，上からの幅に加え更にトップの見出しからの差による補正（プラス）が入る． -% 補正には\jlreq@top@contentsを使う． -% 「トップ」というか，一番最初に現れた見出しを入れる． -% リーダーは.から・に変更しました． -\def\@dottedtocline#1#2#3#4#5{% - \jlreq@set@top@contents{#1}% - \ifnum #1>\c@tocdepth \else - \vskip\toclineskip - {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip - \parindent #2\relax\@afterindenttrue - \interlinepenalty\@M - \leavevmode - \@lnumwidth #3\relax - \@tempcnta=#1\relax - \advance\@tempcnta by -\jlreq@top@contents - \@tempdima=1\jlreq@mol - \multiply \@tempdima by \@tempcnta - \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip - \advance\leftskip\@tempdima - {#4}\nobreak - \leaders\hbox{$\m@th\mkern \@dotsep mu$\null\inhibitglue ・\inhibitglue\null$\m@th\mkern \@dotsep mu$}% - \hfill\nobreak - \hb@xt@\@pnumwidth{\hss\normalfont\normalcolor #5}% - \par}% - \fi} - -% listoffigures -\newcommand{\listoffigures}{% - \jlreq@top@contents=-100 - \section*{\listfigurename}% - \@mkboth{\listfigurename}{\listfigurename}% - \@starttoc{lof}% -} -\newcommand*{\l@figure}{\@dottedtocline{1}{0\jlreq@gol}{2\jlreq@gol}} -\newcommand{\listoftables}{% - \jlreq@top@contents=-100 - \section*{\listtablename}% - \@mkboth{\listtablename}{\listtablename}% - \@starttoc{lot}% -} -\let\l@table\l@figure - -%. 文献，そのまま -\newdimen\bibindent -\setlength\bibindent{2\jlreq@mol} -\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} -\newenvironment{thebibliography}[1]{% - \jlreq@oldfontcommand@enable - \section*{\refname}% - \@mkboth{\refname}{\refname}% - \list{\@biblabel{\@arabic\c@enumiv}}% - {\settowidth\labelwidth{\@biblabel{#1}}% - \leftmargin\labelwidth - \advance\leftmargin\labelsep - \itemindent=0pt - \@openbib@code - \usecounter{enumiv}% - \let\p@enumiv\@empty - \renewcommand\theenumiv{\@arabic\c@enumiv}}% - \sloppy - \clubpenalty4000 - \@clubpenalty\clubpenalty - \widowpenalty4000% - \sfcode`\.\@m -}{% - \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% - \endlist - \jlreq@oldfontcommand@disable -} -\let\@openbib@code\@empty -\if@tate - \def\@cite#1#2{\jlreq@rensuji{[{#1\if@tempswa , #2\fi}]}} - \def\@biblabel#1{\jlreq@rensuji{[#1]}} -\fi - -%. 索引 -\newif\ifjlreq@resttate -\newenvironment{theindex}{% - \jlreq@oldfontcommand@enable - \jlreq@iftdir{\clearpage\yoko\jlreq@resttatetrue}{\jlreq@resttatefalse}% 常に横書きにする - \if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi - \columnseprule\z@ \columnsep 2\jlreq@mol - \twocolumn[\section*{\indexname}]% - \@mkboth{\indexname}{\indexname}% - \thispagestyle{plain}% - \parindent\z@ - \parskip\z@ \@plus .03\jlreq@gol\relax - \let\item\@idxitem -}{% - \if@restonecol\onecolumn\else\clearpage\fi - \ifjlreq@resttate\tate\fi - \jlreq@oldfontcommand@disable -} -\newcommand{\@idxitem}{\par\hangindent 4\jlreq@mol} -\newcommand{\subitem}{\@idxitem \hspace*{2\jlreq@mol}} -\newcommand{\subsubitem}{\@idxitem \hspace*{3\jlreq@mol}} -\newcommand{\indexspace}{\par \vskip 1\jlreq@gol \@plus .5\jlreq@gol \@minus .3\jlreq@gol\relax} - - -%. 前付，後付，付録 -\ifthenelse{\equal{\jlreq@article@type}{book}}{ - \newif\if@mainmatter - \@mainmattertrue - \newcommand*{\frontmatter}{% - \cleardoublepage - \@mainmatterfalse - \let\jlreq@pagestyle@atmain\jlreq@current@pagestyle - \SaveHeading{chapter}{\jlreq@heading@chapter@atmain}% - \ModifyHeading{chapter}{label_format={},after_label_space=0pt}% - \pagestyle{plain}% - \pagenumbering{roman}} - \newcommand*{\mainmatter}{% - \cleardoublepage - \@mainmattertrue - \@ifundefined{jlreq@pagestyle@atmain}{}{% - \expandafter\pagestyle\expandafter{\jlreq@pagestyle@atmain}% - }% - \@ifundefined{jlreq@heading@chapter@atmain}{}{\jlreq@heading@chapter@atmain}% - \setcounter{chapter}{0}% - \pagenumbering{arabic}} - \newcommand*{\backmatter}{% - \if@openright - \cleardoublepage - \else - \clearpage - \fi - \ifthenelse{\equal{\jlreq@article@type}{article}}{}{%book, report - \SaveHeading{chapter}{\jlreq@heading@chapter@atmain}% - \ModifyHeading{chapter}{label_format={},after_label_space=0pt}% - }% - \pagestyle{plain}% - \@mainmatterfalse - \setcounter{chapter}{0}} -}{} -\newcommand*{\appendix}{\par - \setcounter{section}{0}% -} - -\ifthenelse{\equal{\jlreq@article@type}{article}}{ - \appto\appendix{% - \setcounter{subsection}{0}% - \if@tate - \def\thesection{\jlreq@rensuji{\Alph{section}}}% - \else - \def\thesection{\Alph{section}}% - \fi - } -}{%book, report - \appto\appendix{% - \setcounter{chapter}{0}% - \if@tate - \def\thechapter{\jlreq@rensuji{\Alph{chapter}}}% - \else - \def\thechapter{\Alph{chapter}}% - \fi - \ModifyHeading{chapter}{label_format={付録\thechapter}}% - \ifx\jlreq@current@pagestyle\@undefined\else - \ifthenelse{\equal{\jlreq@current@pagestyle}{headings}}{% - \def\chaptermark#1{\markboth{付録\thechapter\quad #1}{}}% - \ModifyPageStyle{headings}{mark_format={_chapter={付録\thechapter\quad #1}}}% - }{}% - \fi - } -} - -%. その他諸々 -%.. 縦中横 -\DeclareRobustCommand*{\tatechuyoko}[1]{% - \jlreq@ifydir{\ClassError{jlreq}{\string\tatechuyoko\space is not allowed in yoko mode}{\@ehc}}{}% - \jlreq@lastnodechar=\lastnodechar - \ifvmode\leavevmode\fi - % 前のJFM glue - \ifnum\jlreq@lastnodechar=-1\else - \inhibitglue - \jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{阿}% - \jlreq@ifgluezero\jlreq@resultskip{}{\hskip\jlreq@resultskip}% - \fi - \hbox{\yoko - \setbox\jlreq@tempboxa=\hbox{阿}% - \vrule width 0pt height \ht\jlreq@tempboxa depth \dp\jlreq@tempboxa #1}% - \futurelet\jlreq@nextchar\jlreq@tatechuyoko@ -} -\def\jlreq@tatechuyoko@{% - \begingroup - \def\jlreq@do{}% - \jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}% - \expandafter\jlreq@ifletter\expandafter{\jlreq@tempa}{% - \jlreq@calc@jfmglue{阿}{\jlreq@tempa}% - \edef\jlreq@do{% - \noexpand\hskip\the\jlreq@resultskip\space - \noexpand\inhibitglue - }% - }{}% - \expandafter\endgroup - \jlreq@do -} - -% 日にち -\newif\if西暦 -\def\西暦{\西暦true} -\def\和暦{\西暦false} -% #1年#2月#3日 #4は\numberとか\kansujiとか -\def\jlreq@wareki#1#2#3#4{% - \jlreq@warekiyear{#1}{#2}{#3}{#4}% - #4#2月#4#3日% -} -\def\jlreq@warekiyear#1#2#3#4{% - % 昭和：1989年1月7日まで - \ifnum0\ifnum#1<1988 1\fi\ifnum#1=1989 \ifnum#2=1 \ifnum#3<8 1\fi\fi\fi>0 - 昭和\jlreq@warekiyear@{#1}{1926}{#4}% - % 平成：2019年4月末日まで - \else%\ifnum0\ifnum#1<2019 1\fi\ifnum#1=1989 \ifnum#2<5 1\fi\fi>0 - 平成\jlreq@warekiyear@{#1}{1989}{#4}% -% \else -% 新元号\jlreq@warekiyear@{#1}{2019}{#4}% - \fi%\fi -} -\def\jlreq@warekiyear@#1#2#3{\ifnum#1=#2 元年\else #3\numexpr#1-#2+1\relax 年\fi} -\def\today{% - \if西暦 - \jlreq@iftdir{% - \kansuji\year 年% - \kansuji\month 月% - \kansuji\day 日% - }{% - \number\year 年% - \number\month 月% - \number\day 日% - }% - \else - \jlreq@iftdir{% - \jlreq@wareki{\year}{\month}{\day}{\kansuji}% - }{% - \jlreq@wareki{\year}{\month}{\day}{\number}% - }% - \fi -} -\jlreq@jlreqsetup@add{year_style}[seireki,wareki]{% - \jlreq@switch{#1}{% - {seireki}{\西暦true} - {wareki}{\西暦false} - } -} -\if@tate - \jlreqsetup{year_style=wareki} -\else - \jlreqsetup{year_style=seireki} -\fi - -% 時刻 -\hour=\time \divide\hour by 60 -\minute=\numexpr\time - 60*\hour\relax - -%.. 定理環境 -\jlreq@saveoriginalcs{\@begintheorem} -\jlreq@saveoriginalcs{\@opargbegintheorem} -\def\@begintheorem#1#2{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax - \trivlist\labelsep=1\zw - \itemindent=\dimexpr\jlreq@theorem@indent\relax - \item[\hskip \labelsep{\sffamily\bfseries #1\ #2}]} -\def\@opargbegintheorem#1#2#3{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax - \trivlist\labelsep=1\zw - \itemindent=\dimexpr\jlreq@theorem@indent\relax - \item[\hskip \labelsep{\sffamily\bfseries #1\ #2（#3）}]} -\AtEndOfPackageFile*{amsthm}{% - \jlreq@saveoriginalcs{\proof}% - \jlreq@saveoriginalcs{\endproof}% - \edef\jlreq@do{ - \unexpanded{\def\jlreq@proof[#1]}{% - \unexpanded{\labelsep=1\zw}% - \expandonce{\proof[{\reset@font\sffamily\bfseries #1\inhibitglue}\nopunct]}% - } - } - \jlreq@do - \def\proof{\@ifnextchar[{\jlreq@proof}{\jlreq@proof[\proofname]}} - \renewcommand{\proofname}{証明} - \jlreq@setupamsthm - \theoremstyle{jlreq} -} -\def\jlreq@setupamsthm{ - \newtheoremstyle{jlreq}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\normalfont}{\dimexpr\jlreq@theorem@indent\relax}{\sffamily\bfseries}{}{1\zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{（##3）}} -} -\jlreq@jlreqsetup@add{theorem_beforeafter_space}{ - \def\jlreq@theorem@beforeafter@space{#1} - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} -} -\jlreq@jlreqsetup@add{theorem_indent}{ - \def\jlreq@theorem@indent{#1} - \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} -} -\jlreqsetup{theorem_beforeafter_space=1\baselineskip,theorem_indent=0pt} - - -% デフォルト設定 -\newcommand{\contentsname}{目次} -\newcommand{\refname}{参考文献} -\newcommand{\indexname}{索引} -\pagestyle{plain} -\pagenumbering{arabic} -\if@twocolumn - \twocolumn - \sloppy - \flushbottom -\else - \onecolumn - \raggedbottom -\fi -\endinput - - +%% Japanese document class based on requirements for Japanese text layout +%% +%% The package is distributed under the BSD 2-Clause License +%% +%% +% (based on JLReq 20120403 https://www.w3.org/TR/2012/NOTE-jlreq-20120403/ja/) +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{jlreq}[2018/08/15 jlreq] +\RequirePackage{xkeyval,everyhook,filehook,etoolbox,ifthen} +\RequirePackage{jlreq-helpers} + +\newcommand*{\jlreq@undeferr}[1]{\ClassError{jlreq}{Trying to delete \string#1 even though it is not defined, may be a bug}{\@ehc}} +% クラスファイル内でしか使わないマクロをクラスファイル終了時に未定義にする +\newcommand*{\jlreq@aftercls@addtodeletecs}[1]{% + \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefcs{#1}{\jlreq@undeferr}}% +} +\newcommand*{\jlreq@aftercls@addtodeleteif}[1]{% + \appto\jlreq@aftercls@deletecslist{\jlreq@helper@undefif{#1}{\jlreq@undeferr}}% +} +\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeletecs} +\jlreq@aftercls@addtodeletecs{\jlreq@aftercls@addtodeleteif} +\AtEndOfClass{% + \jlreq@aftercls@deletecslist + \jlreq@helper@undefcs{\jlreq@aftercls@deletecslist}{\jlreq@undeferr}% + \undef{\jlreq@undeferr}% +} + +% preambleにいるかのスイッチ +\newif\ifjlreq@preamble +\jlreq@preambletrue +\AtBeginDocument{\jlreq@preamblefalse} + +\def\jlreq@saveoriginalcs#1{% + \ifx#1\relax + \ClassError{jlreq}{Trying to save \string#1 but it's not defined, may be a bug}{\@ehc}% + \fi + \expandafter\ifx\csname jlreq@original@\expandafter\@gobble\string#1\endcsname\relax\else + \ClassError{jlreq}{Trying to save \string#1 twice, may be a bug}{\@ehc}% + \fi + \expandafter\let\csname jlreq@original@\expandafter\@gobble\string#1\endcsname=#1 +} +\def\jlreq@useoriginalcs#1{% + \ifcsname jlreq@original@\expandafter\@gobble\string#1\endcsname\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {\csname jlreq@original@\expandafter\@gobble\string#1\endcsname}% + {#1}% +} + +%. オプションの定義 +% オプション処理の際にしか使わない変数（後でそれを元に別の変数を調整する） +% ものは\jlreq@option@に格納する． +% _とかは@に変換する． +% 引数無しの\DeclareOptionX +\newcommand*{\jlreq@DeclareOption}[2]{% + \DeclareOptionX{#1}{% + \jlreq@ifempty{##1}{}{\ClassError{jlreq}{The option #1 should have no value}{\@ehc}}% + #2% + } +} +\jlreq@aftercls@addtodeletecs{\jlreq@DeclareOption} +% エンジン類 +\jlreq@DeclareOption{uplatex}{\let\jlreq@engine=u} +\jlreq@DeclareOption{platex}{\let\jlreq@engine=p} +\jlreq@DeclareOption{lualatex}{\let\jlreq@engine=l} + +% 文書のタイプ +\newcommand*\jlreq@article@type{article} +\define@choicekey{jlreq.cls}{article_type}{article,report,book}{\renewcommand*{\jlreq@article@type}{#1}} +\jlreq@DeclareOption{article}{\renewcommand*{\jlreq@article@type}{article}} +\jlreq@DeclareOption{report}{\renewcommand*{\jlreq@article@type}{report}} +\jlreq@DeclareOption{book}{\renewcommand*{\jlreq@article@type}{book}} + +%.. 基本版面．まずは紙サイズ． +\def\jlreq@switchpapersize{} +\jlreq@aftercls@addtodeletecs{\jlreq@switchpapersize} +% \jlreq@addpapersize{paper=に指定するもの}{単独オプション名}{横}{縦} + +\def\jlreq@addpapersize#1#2{% + \@ifnextchar[{\jlreq@addpapersize@{#1}{#2}}{\jlreq@addpapersize@@{#1}{#2}} +} +\def\jlreq@addpapersize@#1#2[#3]{% + \edef\@tempa{\unexpanded{\jlreq@addpapersize@@{#1}{#2}}\csexpandonce{jlreq@helper@papersizelist@#3}}% + \@tempa +} +\newcommand*{\jlreq@addpapersize@@}[4]{% + \@for\@tempa:=#1\do{% + \eappto\jlreq@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}}}% + }% + \@for\@tempa:=#2\do{% + \expandafter\jlreq@DeclareOption\expandafter{\@tempa}{\setlength{\paperwidth}{#3}\setlength{\paperheight}{#4}}% + }% +} +\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize} +\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@} +\jlreq@aftercls@addtodeletecs{\jlreq@addpapersize@@} +\DeclareOptionX{paper}{ + \edef\jlreq@do{% + \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@switchpapersize}}% + [\unexpanded{% + \jlreq@helper@dividebycomma{#1}% + \ifjlreq@result + \setlength{\paperwidth}{\dimexpr\jlreq@resulta\relax}% + \setlength{\paperheight}{\dimexpr\jlreq@resultb\relax}% + \else + \ClassError{jlreq}{The paper #1 is unknown}{\@ehc}% + \fi + }]% + }% + \jlreq@do +} +% 紙サイズ一覧．b*はJIS B． +\jlreq@addpapersize{a0,A0}{}[a0] +\jlreq@addpapersize{a1,A1}{}[a1] +\jlreq@addpapersize{a2,A2}{}[a2] +\jlreq@addpapersize{a3,A3}{a3paper}[a3] +\jlreq@addpapersize{a4,A4}{a4paper}[a4] +\jlreq@addpapersize{a5,A5}{a5paper}[a5] +\jlreq@addpapersize{a6,A6}{a6paper}[a6] +\jlreq@addpapersize{a7,A7}{}[a7] +\jlreq@addpapersize{a8,A8}{}[a8] +\jlreq@addpapersize{a9,A9}{}[a9] +\jlreq@addpapersize{a10,A10}{}[a10] + +\jlreq@addpapersize{b0,B0}{}[b0] +\jlreq@addpapersize{b1,B1}{}[b1] +\jlreq@addpapersize{b2,B2}{}[b2] +\jlreq@addpapersize{b3,B3}{}[b3] +\jlreq@addpapersize{b4,B4}{b4paper}[b4] +\jlreq@addpapersize{b5,B5}{b5paper}[b5] +\jlreq@addpapersize{b6,B6}{b6paper}[b6] +\jlreq@addpapersize{b7,B7}{}[b7] +\jlreq@addpapersize{b8,B8}{}[b8] +\jlreq@addpapersize{b9,B9}{}[b9] +\jlreq@addpapersize{b10,B10}{}[b10] + +\jlreq@addpapersize{c2,C2}{}[c2] +\jlreq@addpapersize{c3,C3}{}[c3] +\jlreq@addpapersize{c4,C4}{}[c4] +\jlreq@addpapersize{c5,C5}{}[c5] +\jlreq@addpapersize{c6,C6}{}[c6] +\jlreq@addpapersize{c7,C7}{}[c7] +\jlreq@addpapersize{c8,C8}{}[c8] + +\jlreq@addpapersize{a4var}{}[a4var] +\jlreq@addpapersize{b5var}{}[b5var] + +\jlreq@addpapersize{letter}{letterpaper}[letter] +\jlreq@addpapersize{legal}{legalpaper}[legal] +\jlreq@addpapersize{executive}{executivepaper}[executive] +\jlreq@addpapersize{hagaki}{}[hagaki] + + +%.. フォントサイズ，行長，1ページあたりの行数で基本版面のサイズを決める（2.4.1.a） +\newcommand*{\jlreq@option@fontsize}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@fontsize} +\DeclareOptionX{fontsize}{\renewcommand*{\jlreq@option@fontsize}{#1}} +\jlreq@DeclareOption{10pt}{\renewcommand*{\jlreq@option@fontsize}{10pt}} +\jlreq@DeclareOption{11pt}{\renewcommand*{\jlreq@option@fontsize}{11pt}} +\jlreq@DeclareOption{12pt}{\renewcommand*{\jlreq@option@fontsize}{12pt}} +\newcommand*{\jlreq@option@jafontsize}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontsize} +\DeclareOptionX{jafontsize}{\renewcommand*{\jlreq@option@jafontsize}{#1}} +\newcommand*{\jlreq@option@jafontscale}{1} +\DeclareOptionX{jafontscale}{\renewcommand*{\jlreq@option@jafontscale}{#1}} +\jlreq@aftercls@addtodeletecs{\jlreq@option@jafontscale} +%.. 行の長さ +\newcommand*{\jlreq@option@line@length}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@line@length} +\DeclareOptionX{line_length}{\renewcommand*{\jlreq@option@line@length}{#1}} +%.. 1ページあたりの行数 +\newcommand*{\jlreq@option@number@of@lines}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@number@of@lines} +\DeclareOptionX{number_of_lines}{\renewcommand*{\jlreq@option@number@of@lines}{#1}} + +% 地の空き量，のどの空き量で配置位置を決める（2.4.1.b）省略されたら中央配置． +%.. 天 +\newcommand*{\jlreq@option@head@space}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@head@space} +\DeclareOptionX{head_space}{\renewcommand*{\jlreq@option@head@space}{#1}} + +%.. 地 +\newcommand*{\jlreq@option@foot@space}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@foot@space} +\DeclareOptionX{foot_space}{\renewcommand*{\jlreq@option@foot@space}{#1}} +%.. のど +\newcommand*{\jlreq@option@gutter}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@gutter} +\DeclareOptionX{gutter}{\renewcommand*{\jlreq@option@gutter}{#1}} +%.. 小口 +\newcommand*{\jlreq@option@fore@edge}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@fore@edge} +\DeclareOptionX{fore_edge}{\renewcommand*{\jlreq@option@fore@edge}{#1}} + +%.. 柱とノンブル +\newcommand*{\jlreq@option@headfoot@verticalpos}{} +\jlreq@aftercls@addtodeletecs{\jlreq@option@headfoot@verticalpos} +% 本文とヘッダ/フッタの間の空き +\DeclareOptionX{headfoot_verticalposition}{\renewcommand*{\jlreq@option@headfoot@verticalpos}{#1}} +% 柱やノンブルの左右の空き +\newcommand*{\jlreq@headfoot@sidemargin}{0pt} +\DeclareOptionX{headfoot_sidemargin}{\renewcommand*{\jlreq@headfoot@sidemargin}{#1}} + +%.. 段間 +\newcommand*{\jlreq@option@column@gap}{2zw} +\jlreq@aftercls@addtodeletecs{\jlreq@option@column@gap} +\DeclareOptionX{column_gap}{\renewcommand*{\jlreq@option@column@gap}{#1}} + +%.. 行送り，指定無しの場合は文字サイズの1.7倍とする．（1.5から2倍が好ましい：2.4.2.d 注3） +\newcommand*{\jlreq@option@baselineskip}{17zw/10} +\jlreq@aftercls@addtodeletecs{\jlreq@option@baselineskip} +\DeclareOptionX{baselineskip}{\def\jlreq@option@baselineskip{#1}} +\DeclareOptionX{linegap}{\def\jlreq@option@baselineskip{1zw + #1}} + +%.. 組み方系 +% 行頭に括弧が来たときの配置：3.1.5 +% 段落頭指定_折り返し行頭指定 で与える． +\newcommand*{\jlreq@open@bracket@pos}{zenkaku_tentsuki} +\define@choicekey{jlreq.cls}{open_bracket_pos}{zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\renewcommand*{\jlreq@open@bracket@pos}{#1}} +% ぶら下げ組みをするか：3.8.2 注1 +\newif\ifjlreq@burasage\jlreq@burasagefalse +\jlreq@DeclareOption{hanging_punctuation}{\jlreq@burasagetrue} + +%.. 注 +% 傍注のタイプ +\newcommand*{\jlreq@option@sidenote@length}{0pt} +\jlreq@aftercls@addtodeletecs{\jlreq@option@sidenote@length} +\DeclareOptionX{sidenote_length}{\renewcommand*{\jlreq@option@sidenote@length}{#1}} + +%.. もろもろ +\newif\if@restonecol\@restonecolfalse +\newif\if@titlepage\@titlepagefalse +\newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepageかnotitlepageかが指定された +\newif\if@landscape\@landscapefalse +\newif\if@tate \@tatefalse +\jlreq@DeclareOption{landscape}{\@landscapetrue} +\jlreq@DeclareOption{tombo}{\ClassWarningNoLine{jlreq}{The option `tombo' is not supported by jlreq class. Please use the jlreq-trimmarks package}} +\jlreq@DeclareOption{tombow}{\ClassWarningNoLine{jlreq}{The option `tombow' is not supported by jlreq class. Please use the jlreq-trimmarks package}} +\jlreq@DeclareOption{mentuke}{\ClassWarningNoLine{jlreq}{The option `mentuke' is not supported by jlreq class. Please use the jlreq-trimmarks package}} +\jlreq@DeclareOption{tate}{\@tatetrue} + +\newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % onesideかtwosideが指定された +\jlreq@aftercls@addtodeleteif{\ifjlreq@option@twoside} +\jlreq@DeclareOption{oneside}{\@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue} +\jlreq@DeclareOption{twoside}{\@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue} +\jlreq@DeclareOption{onecolumn}{\@twocolumnfalse} +\jlreq@DeclareOption{twocolumn}{\@twocolumntrue} +\jlreq@DeclareOption{titlepage}{\jlreq@option@titlepagetrue\@titlepagetrue} +\jlreq@DeclareOption{notitlepage}{\jlreq@option@titlepagetrue\@titlepagefalse} +\jlreq@DeclareOption{draft}{\setlength\overfullrule{5pt}} +\jlreq@DeclareOption{final}{\setlength\overfullrule{0pt}} +\newif\if@openright +\newif\ifjlreq@option@open \jlreq@option@openfalse % openrightかopenanyが指定された +\jlreq@aftercls@addtodeleteif{\ifjlreq@option@open} +\jlreq@DeclareOption{openright}{\@openrighttrue\jlreq@option@opentrue} +\jlreq@DeclareOption{openany}{\@openrightfalse\jlreq@option@opentrue} +\jlreq@DeclareOption{leqno}{\input{leqno.clo}} +\jlreq@DeclareOption{fleqn}{\input{fleqn.clo}} + +\newcommand*{\jlreq@note}[1]{} +\jlreq@DeclareOption{jlreq_notes}{\renewcommand*{\jlreq@note}[1]{\message{^^JJLReq note: ##1^^J}}} + +\ExecuteOptionsX{article_type=article,paper=a4,open_bracket_pos=zenkaku_tentsuki,onecolumn,final} +% \@removeelementを一旦置き換えてから\ProcessOptionsXを実行する +\let\jlreq@temporary@original@@removeelement=\@removeelement +\let\@removeelement=\jlreq@helper@removeelement +\ProcessOptionsX\relax +\let\@removeelement=\jlreq@temporary@original@@removeelement +\let\jlreq@temporary@original@@removeelement=\@undefined + +\ifjlreq@option@titlepage\else + \ifthenelse{\equal{\jlreq@article@type}{article}}{\@titlepagefalse}{\@titlepagetrue} +\fi +\ifjlreq@option@open\else + \ifthenelse{\equal{\jlreq@article@type}{book}}{\@openrighttrue}{\@openrightfalse} +\fi +% articleではopenrightは効かない． +\ifthenelse{\equal{\jlreq@article@type}{article}}{% + \if@openright + \ClassWarningNoLine{jlreq}{The option `openright' is ignored in article} + \@openrightfalse + \fi +}{} +\ifjlreq@option@twoside\else + \ifthenelse{\equal{\jlreq@article@type}{book}}{\@twosidetrue}{\@twosidefalse} +\fi + +\def\jlreq@jlreqsetup@keyvallist{} +\def\jlreq@jlreqsetup@finally{} +\newcommand{\jlreqsetup}[1]{% + \begingroup + \edef\jlreq@do{\unexpanded{\jlreq@parsekeyval[jlreqsetup]}{\expandonce{\jlreq@jlreqsetup@keyvallist}}}% + \expandafter\endgroup + \jlreq@do{#1}% + \jlreq@jlreqsetup@finally +} +% \jlreqsetupの項目に加えるマクロ．\jlreq@jlreqsetup@add{key}{action}とするとkeyに対して定義できる． +% action内ではvalが#1として取得できる．（従ってaction内でマクロを定義する際には##1を使う必要がある．） +\newcommand{\jlreq@jlreqsetup@add}[1]{% + \@ifnextchar[{\jlreq@jlreqsetup@add@{#1}}{\jlreq@jlreqsetup@add@@{#1}}% +} +\long\def\jlreq@jlreqsetup@add@#1[#2]#3{% + \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}[#2]{#3}}}% +} +\long\def\jlreq@jlreqsetup@add@@#1#2{% + \eappto\jlreq@jlreqsetup@keyvallist{\unexpanded{{#1}{#2}}}% +} +% \jlreqsetupの最後に必ず実行される処理を入れる． +\newcommand\jlreq@jlreqsetup@addtofinally[1]{\eappto\jlreq@jlreqsetup@finally{\unexpanded{#1}}} +\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add} +\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@} +\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@add@@} +\jlreq@aftercls@addtodeletecs{\jlreq@jlreqsetup@addtofinally} +\@onlypreamble\jlreqsetup + +% エンジンの設定 +\ifx\jlreq@engine\@undefined + \jlreq@helper@guessengine + \let\jlreq@engine=\jlreq@result +\fi + + +% 必要パッケージのロード +\ifx l\jlreq@engine + \RequirePackage{luatexja} + \directlua{jlreq = {}} +\fi + +% (u)pLaTeXの場合ここで初めて\epTeXinputencodingが発行されるので， +% これ以前には和文は使えない． +\ifx l\jlreq@engine\else + \epTeXinputencoding utf8 + \def\zw{zw}\def\zh{zh} + % http://oku.edu.mie-u.ac.jp/tex/mod/forum/discuss.php?d=1508&parent=8435 + \if@tate\AtEndPreamble{\par}\fi +\fi +\if@tate + \AtBeginDocument{\tate\message{《縦組モード》}\adjustbaseline} +\fi + +% \jlreq@gol(Gyo Okuri Length), \jlreq@mol (Moji Okuri Length)を定義 +\let\jlreq@gol=\zh +\let\jlreq@mol=\zw + +%. helper2（エンジン依存系：和文文字を含むものもこれ以降） +% #1のboxを今の真ん中に配置する． +\def\jlreq@box@putcenter#1{% + \begingroup + \jlreq@tempdima=\dimexpr(\ht#1 - \dp#1)/2\relax + \setbox\jlreq@tempboxa=\hbox{阿}% + \edef\jlreq@do{% + \noexpand\lower\the\dimexpr(\jlreq@tempdima - (\ht\jlreq@tempboxa - \dp\jlreq@tempboxa)/2)\relax\unexpanded{\box#1}% + }% + \expandafter\endgroup + \jlreq@do +} + +% #1の先頭が文字か +\long\def\jlreq@ifletter#1{% + \jlreq@iffirsttoken{#1}{ }{\@secondoftwo}{% + \expandafter\expandafter\expandafter\jlreq@helper@ifletter\jlreq@getfirsttoken#1\jlreq@uniqtoken{}\jlreq@endmark@ + }% +} + +\long\def\jlreq@helper@ifletter#1{% + \ifnum + 0% + \ifcat 阿\noexpand #11\fi + \ifcat あ\noexpand #11\fi + \ifcat （\noexpand #11\fi + \ifcat A\noexpand #11\fi + \ifcat 1\noexpand #11\fi + >0 + \expandafter\@firstoftwo\else\expandafter\@secondoftwo + \fi +} + + +% 組方向を判定 +% \jlreq@if(y|t)(dir|box)を定義する． +\ifx l\jlreq@engine\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{ + \def\jlreq@ifydir{\ifnum\ltjgetparameter{direction}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@iftdir{\ifnum\numexpr\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@ifybox#1{\ifnum\ltjgetparameter{boxdir}{#1}=4 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@iftbox#1{\ifnum\numexpr\ltjgetparameter{boxdir}{#1}-(\ltjgetparameter{boxdir}{#1}/8)*8\relax=3 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +}{ + \def\jlreq@ifydir{\ifydir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@iftdir{\iftdir\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@ifybox#1{\ifybox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} + \def\jlreq@iftbox#1{\iftbox#1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +} + +% 左ページであるか +% #1 : odd or even or ページ数 +\def\jlreq@ifleftpage#1{% + \ifthenelse{\(\boolean{@tate} \AND + \(\equal{#1}{odd} \OR \(\(\NOT \equal{#1}{even}\) \AND \isodd{#1}\)\) + \) \OR \(\(\NOT \boolean{@tate}\) \AND + \(\equal{#1}{even} \OR \(\(\NOT \equal{#1}{odd}\) \AND \(\NOT \isodd{#1}\)\)\) + \)}% +} + +\ifx l\jlreq@engine + \newcommand*{\jlreq@getpostbreakpenalty}[1]{\ltjgetparameter{postbreakpenalty}{#1}} +\else + \newcommand*{\jlreq@getpostbreakpenalty}[1]{\postbreakpenalty#1} +\fi + +% 現在行の残りを得る． +\ifx l\jlreq@engine + % 以下のコードはおかしい． + \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{% + \dimexpr\zposx{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp - \@totalleftmargin - + \ifodd\jlreq@currentpage + \oddsidemargin + \else + \evensidemargin + \fi + \iftombow - 1in\fi + - 1in - \hoffset\relax + } +\else + \newcommand*{\jlreq@calc@current@linewidth@onecolumn}{% + \dimexpr + \jlreq@ifydir{% + \zposx{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp - \hoffset + \ifodd\jlreq@currentpage + - \oddsidemargin + \else + - \evensidemargin + \fi + }{% + \ifdim\pdfpagewidth=0pt + \paperheight + \else + \pdfpageheight + \fi + - \topmargin - \headheight - \headsep - \voffset + - \zposy{jlreq@rest@width.pos.\the\jlreq@zref@reference@count} sp + }% + \iftombow - 1in\fi + - \@totalleftmargin - 1in + \relax + } +\fi +\newcommand*{\jlreq@calc@current@linewidth}{% + \dimexpr\jlreq@calc@current@linewidth@onecolumn + \if@twocolumn + \ifdim\jlreq@calc@current@linewidth@onecolumn<\dimexpr\linewidth+\columnsep\relax\else + - \linewidth - \columnsep + \fi + \fi + \relax +} + +\newdimen\jlreq@current@linewidth +\newdimen\jlreq@rest@linewidth +% この命令以降，次にこの命令を実行する前まで\jlreq@current@linewidth/\jlreq@rest@linewidthで +% この行の行頭からの長さ/残りの長さが取得できる +\newcommand*{\jlreq@savepos@for@rest@linewidth}{% + \jlreq@setcurrentpage + \global\advance\jlreq@zref@reference@count by 1\relax + \zsavepos{jlreq@rest@width.pos.\the\jlreq@zref@reference@count}% + \global\jlreq@current@linewidth=\jlreq@calc@current@linewidth + \global\jlreq@rest@linewidth=\dimexpr\linewidth - \jlreq@current@linewidth\relax + \edef\jlreq@savepos@iflabelundefined{\noexpand\zref@ifrefundefined{jlreq@rest@width.pos.\the\jlreq@zref@reference@count}}% +} + +\ifx l\jlreq@engine + \newcommand*{\lastnodechar}{\directlua{luatexja.pltx_composite_last_node_char()}}% undocumentedな機能を使っている +\fi + +% #1と#2の間に入るjmglue（(x)kanjiskipも）を\jlreq@resultskipに入れる +\ifx l\jlreq@engine + \newcommand*{\jlreq@calc@jfmglue}[2]{% + \begingroup + \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}% + \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}% + \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\dimexpr\wd\jlreq@tempboxb - \wd\jlreq@tempboxa\relax\noexpand\relax}% + \jlreq@do + \directlua{ + local width = 0 + local stretch = 0 + local shrink = 0 + local n = tex.box["jlreq@tempboxb"].head + while n do + % すべてのglueの和を計算する． + if n.id == node.id("glue") then + width = width + n.width + stretch = stretch + n.stretch + shrink = shrink + n.shrink + end + n = n.next + end + tex.setglue("jlreq@tempskipa",width,stretch,shrink) + }% + % TeXで計測した物と一致していなければTeXでの方を信じる + \ifdim\jlreq@resultskip=\jlreq@tempskipa + \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\jlreq@tempskipa\relax}% + \fi + \expandafter\endgroup + \jlreq@do + } +\else + \newcommand*{\jlreq@calc@jfmglue}[2]{% + \begingroup + \setbox\jlreq@tempboxa=\hbox{\inhibitglue #1\inhibitglue\hbox{}\inhibitglue#2\inhibitglue}% + \setbox\jlreq@tempboxb=\hbox{\inhibitglue #1#2\inhibitglue}% + \edef\jlreq@do{\noexpand\jlreq@resultskip=\the\dimexpr\wd\jlreq@tempboxb - \wd\jlreq@tempboxa\relax\noexpand\relax}% + \expandafter\endgroup + \jlreq@do + } +\fi + +\newcount\jlreq@lastnodechar +% \jlreq@fixjfm<次の文字>の形で使う． +% jlreq@lastnodecharに入っている値と次のトークン（\futureletで得る）の間に入るJFMグルー等を挿入する +\newcommand*{\jlreq@fixjfm}{% + \begingroup + \ifnum\jlreq@lastnodechar>-1 + \def\jlreq@do{\futurelet\jlreq@nextchar\jlreq@insertjfm}% + \else\def\jlreq@do{}\fi + \expandafter\endgroup + \jlreq@do +} +% \jlreq@nextcharと\jlreq@lastnodecharの間のJFMグルーを挿入 +\def\jlreq@insertjfm{% + \ifnum\jlreq@getpostbreakpenalty{\jlreq@lastnodechar}=0\else\penalty\jlreq@getpostbreakpenalty{\jlreq@lastnodechar}\fi + \begingroup + \def\jlreq@do{}% + \jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}% + \expandafter\jlreq@ifletter\expandafter{\jlreq@tempa}{% + \jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{\jlreq@tempa}% +% \message{fixjfm Insert: \the\jlreq@resultskip}% + \edef\jlreq@do{% + \noexpand\hskip\the\jlreq@resultskip\space + \noexpand\inhibitglue + }% + }{}% + \expandafter\endgroup + \jlreq@do +} + +\ifx l\jlreq@engine + \newcommand*{\jlreq@divide}[2]{% + \jlreq@resultdimen=\directlua{tex.print(tostring(\strip@pt\dimexpr #1\relax/\strip@pt\dimexpr #2\relax) .. "pt ")}% + } +\else + \let\jlreq@divide=\jlreq@helper@divide +\fi + +%. 基本設定 +\providecommand*{\jlreq@kanjiskip}{0pt plus 0.25\zw minus 0pt} +\providecommand*{\jlreq@xkanjiskip}{0.25\zw plus 0.25\zw minus 0.125\zw} +\ifx l\jlreq@engine + \ltjsetparameter{kanjiskip=\jlreq@kanjiskip} + \ltjsetparameter{xkanjiskip=\jlreq@xkanjiskip} +\else + \kanjiskip=\jlreq@kanjiskip + \xkanjiskip=\jlreq@xkanjiskip +\fi + +% 文字クラスのリスト（必要なものだけ） +% 開き括弧（文字クラス1） +\edef\jlreq@charlist@openingbrackets{（〔［｛〈《「『【‘“\ifx p\jlreq@engine\else ｟〘〖«〝\fi} +% 閉じ括弧（文字クラス2） +\edef\jlreq@charlist@closingbrackets{）〕］｝〉》」』】’”\ifx p\jlreq@engine\else｠〙〗»〟\fi} +% ハイフン（文字クラス3） +\edef\jlreq@charlist@hyphens{‐〜\ifx p\jlreq@engine\else ゠–\fi} +% 区切り約物（文字クラス4） +\edef\jlreq@charlist@dividingpunctuationmarks{！？\ifx p\jlreq@engine\else ‼⁇⁈⁉\fi} +% 中点類（文字クラス5） +\edef\jlreq@charlist@middlenodes{・：；} +% 句点類（文字クラス6） +\edef\jlreq@charlist@fullstops{。．} +% 読点類（文字クラス7） +\edef\jlreq@charlist@commas{、，} +% 分離禁止文字（文字クラス8） +\edef\jlreq@charlist@inseparablecharacters{—…‥\ifx p\jlreq@engine\else 〳〴〵\fi} +% 繰返し記号（文字クラス9） +\edef\jlreq@charlist@iterationmarks{ヽヾゝゞ々\ifx p\jlreq@engine\else 〻\fi} +% 長音記号（文字クラス10） +\edef\jlreq@charlist@prolongedsoundmark{ー} +% 小書きの仮名（文字クラス11） +\edef\jlreq@charlist@smallkana{ぁぃぅぇぉァィゥェォっゃゅょゎッャュョヮヵヶ\ifx p\jlreq@engine\else ゕゖㇰㇱㇲㇳㇴㇵㇶㇷㇸㇹㇺㇻㇼㇽㇾㇿ\fi}%ㇷ゚ +% 前置省略記号（文字クラス12） +\edef\jlreq@charlist@prefixedabbreviations{￥＄￡＃\ifx p\jlreq@engine\else €№\fi} +% 平仮名（文字クラス15） +\edef\jlreq@charlist@hiragana{あいうえおかがきぎくぐけげこごさざしじすずせぜそぞただちぢつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもやゆよらりるれろわゐゑをん\ifx p\jlreq@engine\else ゔ\fi}% か゚き゚く゚け゚こ゚ +% 片仮名（文字クラス16） +\edef\jlreq@charlist@katakana{アイウエオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモヤユヨラリルレロワヰヱヲンヴ\ifx p\jlreq@engine\else ヷヸヹヺ\fi}% カ゚キ゚ク゚ケ゚コ゚セ゚ツ゚ト゚ + +\ifx l\jlreq@engine + \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\ltjsetparameter{postbreakpenalty={`#1,#2}}} + \newcommand*{\jlreq@setprebreakpenalty@}[2]{\ltjsetparameter{prebreakpenalty={`#1,#2}}} + \newcommand*{\jlreq@addjaxspmode@}[2]{% + \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}% + \jlreq@switch{#2}{ + {pre}{% + \ifnum\jlreq@tempcnta=2 + \ltjsetparameter{jaxspmode={`#1,allow}}% + \else\ifnum\jlreq@tempcnta=0 + \ltjsetparameter{jaxspmode={`#1,preonly}}% + \fi\fi + } + {post}{% + \ifnum\jlreq@tempcnta=1 + \ltjsetparameter{jaxspmode={`#1,allow}}% + \else\ifnum\jlreq@tempcnta=0 + \ltjsetparameter{jaxspmode={`#1,postonly}}% + \fi\fi + } + }% + } + \newcommand*{\jlreq@deljaxspmode@}[2]{% + \jlreq@tempcnta=\ltjgetparameter{jaxspmode}{`#1}% + \jlreq@switch{#2}{ + {pre}{% + \ifnum\jlreq@tempcnta=2 + \ltjsetparameter{jaxspmode={`#1,postonly}}% + \else\ifnum\jlreq@tempcnta=1 + \ltjsetparameter{jaxspmode={`#1,inhibit}}% + \fi\fi + } + {post}{% + \ifnum\jlreq@tempcnta=3 + \ltjsetparameter{jaxspmode={`#1,preonly}}% + \else\ifnum\jlreq@tempcnta=2 + \ltjsetparameter{jaxspmode={`#1,inhibit}}% + \fi\fi + } + }% + } +\else + \newcommand*{\jlreq@setpostbreakpenalty@}[2]{\postbreakpenalty`#1=#2} + \newcommand*{\jlreq@setprebreakpenalty@}[2]{\prebreakpenalty`#1=#2} + \newcommand*{\jlreq@addjaxspmode@}[2]{% + \jlreq@tempcnta=\inhibitxspcode`#1 + \jlreq@switch{#2}{ + {pre}{% + \ifnum\jlreq@tempcnta=1 + \inhibitxspcode`#1=3 + \else\ifnum\jlreq@tempcnta=0 + \inhibitxspcode`#1=2 + \fi\fi + } + {post}{% + \ifnum\jlreq@tempcnta=2 + \inhibitxspcode`#1=3 + \else\ifnum\jlreq@tempcnta=0 + \inhibitxspcode`#1=1 + \fi\fi + } + }% + } + \newcommand*{\jlreq@deljaxspmode@}[2]{% + \jlreq@tempcnta=\inhibitxspcode`#1 + \jlreq@switch{#2}{ + {pre}{% + \ifnum\jlreq@tempcnta=3 + \inhibitxspcode`#1=1 + \else\ifnum\jlreq@tempcnta=2 + \inhibitxspcode`#1=0 + \fi\fi + } + {post}{% + \ifnum\jlreq@tempcnta=3 + \inhibitxspcode`#1=2 + \else\ifnum\jlreq@tempcnta=1 + \inhibitxspcode`#1=0 + \fi\fi + } + }% + } +\fi +% #1{...}{#3}を...が#2のリストに対して適用． +\newcommand*\jlreq@iterateapply[3]{% + \edef\jlreq@tempa{#2}% + \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@tempa\do{% + \expandafter#1\expandafter{\@tempa}{#3}% + }% +} +\def\jlreq@setpostbreakpenalty{\jlreq@iterateapply{\jlreq@setpostbreakpenalty@}} +\def\jlreq@setprebreakpenalty{\jlreq@iterateapply{\jlreq@setprebreakpenalty@}} +\def\jlreq@addjaxspmode{\jlreq@iterateapply{\jlreq@addjaxspmode@}} +\def\jlreq@deljaxspmode{\jlreq@iterateapply{\jlreq@deljaxspmode@}} + +\jlreq@aftercls@addtodeletecs{\jlreq@iterateapply} +\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty} +\jlreq@aftercls@addtodeletecs{\jlreq@setpostbreakpenalty@} +\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty} +\jlreq@aftercls@addtodeletecs{\jlreq@setprebreakpenalty@} +\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode} +\jlreq@aftercls@addtodeletecs{\jlreq@addjaxspmode@} +\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode} +\jlreq@aftercls@addtodeletecs{\jlreq@deljaxspmode@} + +% 行末禁則 +\jlreq@setpostbreakpenalty{\jlreq@charlist@openingbrackets}{10000} +\jlreq@setpostbreakpenalty{\jlreq@charlist@prefixedabbreviations}{10000} + +% 行頭禁則 +\jlreq@setprebreakpenalty{\jlreq@charlist@closingbrackets}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@hyphens}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@dividingpunctuationmarks}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@middlenodes}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@fullstops}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@commas}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@iterationmarks}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@prolongedsoundmark}{10000} +\jlreq@setprebreakpenalty{\jlreq@charlist@smallkana}{10000} + +% xkanjiskip +\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{pre} +\jlreq@addjaxspmode{\jlreq@charlist@iterationmarks}{post} +\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{pre} +\jlreq@addjaxspmode{\jlreq@charlist@prolongedsoundmark}{post} +\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{pre} +\jlreq@addjaxspmode{\jlreq@charlist@smallkana}{post} +\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{pre} +\jlreq@addjaxspmode{\jlreq@charlist@hiragana}{post} +\jlreq@addjaxspmode{\jlreq@charlist@katakana}{pre} +\jlreq@addjaxspmode{\jlreq@charlist@katakana}{post} +\jlreq@addjaxspmode{\jlreq@charlist@dividingpunctuationmarks}{post} + +% 分割禁止（分離禁止文字は特定の並びで分割禁止だが，とりあえず一括で禁止しておく．） +\jlreq@setprebreakpenalty{\jlreq@charlist@inseparablecharacters}{10000} +% ￥100とか70％とか…… + +%.. 文字範囲 +\ifx u\jlreq@engine + % \kcatcodeの設定 + \def\jlreq@setkcatcode#1#2{\@for\@tempa:=#1\do{\kcatcode"\@tempa=#2\relax}} + \jlreq@aftercls@addtodeletecs{\jlreq@setkcatcode} + % LuaTeX-jaのデフォルトのままに近い設定をする + % 範囲1＆8 + \jlreq@setkcatcode{80}{15} % Latin-1 Supplement，どうしよう…… + \jlreq@setkcatcode{100,180,250,2B0,300,1E00}{15} + % 範囲2 + \jlreq@setkcatcode{370,400,1F00}{18} + % 範囲3 + \jlreq@setkcatcode{2000,2070,20A0,20D0,2100,2150,2190,2200,2300,2400,2500,2580,25A0,2600,2700,2900,2980,2B00}{18} + % 範囲4 + \jlreq@setkcatcode{500,530,590,600,700,750,780,7C0,800,840,8A0,900,980,A00,A80,B00,B80,C00,C80,D00,D80,E00,E80,F00,1000,10A0,1200,1380,13A0,1400,1680,16A0,1700,1720,1740,1760,1780,1800,18B0,1900,1950,1980,19E0,1A00,1A20,1AB0,1B00,1B80,1BC0,1C00,1C50,1C80,1CC0,1CD0,1D00,1D80,1DC0,2400,2440,27C0,27F0,2800,2A00,2C00,4DC0,A4D0,A500,A640,A6A0,A700,A720,A800,A840,A880,A8E0,A900,A930,A960,A980,A9E0,AA00,AA60,AA80,AAE0,AB00,AB30,AB70,ABC0,FB00,FB50,FE00,FE20,FE70,10000,10080,10100,10140,10190,101D0,10280,102A0,102E0,10300,10330,10350,10380,103A0,10400,10450,10480,104B0,10500,10530,10600,10800,10840,10860,10880,108E0,10900,10920,10980,109A0,10A00,10A60,10A80,10AC0,10B00,10B40,10B60,10B80,10C00,10C80,10E60,11000,11080,110D0,11100,11150,11180,111E0,11200,11280,112B0,11300,11400,11480,11580,11600,11660,11680,11700,118A0,11AC0,11C00,11C70,12000,12400,12480,13000,14400,16800,16A40,16AD0,16B00,16F00,16FE0,17000,18800,1B000,1BC00,1BCA0,1D000,1D100,1D200,1D300,1D360,1D400,1D800,1E000,1E800,1E900,1EE00,1F000,1F030,1F0A0,1F100,1F200,1F300,1F600,1F650,1F680,1F700,1F780,1F800,1F900,E000}{15} + % 範囲5（Variation Selectors SupplementはLuaTeX-jaではE01F0--E01EFまで範囲5，他は範囲6） + \jlreq@setkcatcode{D800,DB80,DC00,E0000,F0000,100000}{15} + % 範囲6 + \jlreq@setkcatcode{3040,30A0,31F0}{17} % Hiragana,Katakana,Katakana Phonetic Extensions + \jlreq@setkcatcode{2460,3000,3200,3300,FE10,FE30,FE50,E0100}{18} % Enclosed Alphanumerics,CJK Symbols and Punctuation,Enclosed CJK Letters and Months,CJK Compatibility,Vertical Forms,CJK Compatibility Forms,Small Form Variants,Variation Selectors Supplement + \jlreq@setkcatcode{2E80,3190,3400,4E00,F900,20000}{16} + % 範囲7 + \jlreq@setkcatcode{A000,A490}{18} % Yi Syllables,Yi Radicals + \jlreq@setkcatcode{1100,3130,AC00,D7B0}{19} % Hangul Jamo,Hangul Compatibility Jamo,Hangul Syllables,Hangul Jamo Extended-B + \jlreq@setkcatcode{2F00,2FF0,3100,31A0,31C0,A830}{16} +\fi + +% フォントサイズを設定 +\newdimen\jlreq@fontsize +\newdimen\jlreq@jafontsize +\ifx l\jlreq@engine + % Q,zw,zhが正しく扱われるようになる．\dimexprつきに展開される． + \def\jlreq@expand@optionfontsize#1{% + \dimexpr\directlua{ + local act = string.char(92) + local s = [[#1]] + s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax") + tex.print(s) + }\relax + }% +\else + \def\jlreq@expand@optionfontsize#1{\dimexpr#1\relax} +\fi +\jlreq@aftercls@addtodeletecs{\jlreq@expand@optionfontsize} +\ifx\jlreq@option@fontsize\@empty + \ifx\jlreq@option@jafontsize\@empty + \jlreq@fontsize=10pt + \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize + \else + \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} + \jlreq@divide{\jlreq@jafontsize}{\jlreq@option@jafontscale pt} + \jlreq@fontsize=\jlreq@resultdimen + \fi +\else + \setlength{\jlreq@fontsize}{\jlreq@expand@optionfontsize{\jlreq@option@fontsize}} + \ifx\jlreq@option@jafontsize\@empty + \jlreq@jafontsize=\jlreq@option@jafontscale\jlreq@fontsize + \else + \setlength{\jlreq@jafontsize}{\jlreq@expand@optionfontsize{\jlreq@option@jafontsize}} + \fi +\fi +%. フォント +\RequirePackage{lmodern} + +%.. 古いフォントコマンド +\DeclareOldFontCommand{\jlreq@oldfontcommand@mc}{\normalfont\mcfamily}{\mathmc} +\DeclareOldFontCommand{\jlreq@oldfontcommand@gt}{\normalfont\gtfamily}{\mathgt} +\DeclareOldFontCommand{\jlreq@oldfontcommand@rm}{\normalfont\rmfamily}{\mathrm} +\DeclareOldFontCommand{\jlreq@oldfontcommand@sf}{\normalfont\sffamily}{\mathsf} +\DeclareOldFontCommand{\jlreq@oldfontcommand@tt}{\normalfont\ttfamily}{\mathtt} +\DeclareOldFontCommand{\jlreq@oldfontcommand@bf}{\normalfont\bfseries}{\mathbf} +\DeclareOldFontCommand{\jlreq@oldfontcommand@it}{\normalfont\itshape}{\mathit} +\DeclareOldFontCommand{\jlreq@oldfontcommand@sl}{\normalfont\slshape}{\@nomath\sl} +\DeclareOldFontCommand{\jlreq@oldfontcommand@sc}{\normalfont\scshape}{\@nomath\sc} +\newcommand*{\jlreq@oldfontcommand@enable}{% + \let\mc=\jlreq@oldfontcommand@mc + \let\gt=\jlreq@oldfontcommand@gt + \let\rm=\jlreq@oldfontcommand@rm + \let\sf=\jlreq@oldfontcommand@sf + \let\tt=\jlreq@oldfontcommand@tt + \let\bf=\jlreq@oldfontcommand@bf + \let\it=\jlreq@oldfontcommand@it + \let\sl=\jlreq@oldfontcommand@sl + \let\sc=\jlreq@oldfontcommand@sc +} +\newcommand*{\jlreq@oldfontcommand@disable}{% + \let\mc=\@undefined + \let\gt=\@undefined + \let\rm=\@undefined + \let\sf=\@undefined + \let\tt=\@undefined + \let\bf=\@undefined + \let\it=\@undefined + \let\sl=\@undefined + \let\sc=\@undefined +} + +\DeclareRobustCommand*{\cal}{\@fontswitch\relax\mathcal} +\DeclareRobustCommand*{\mit}{\@fontswitch\relax\mathnormal} + +%.. 和文 +% ダミー +\def\@ptsize{0} +% JFMに関連する設定 +\ifx l\jlreq@engine + % この値は後でjfm-jlreq内で読む + \directlua{jlreq.open_bracket_pos = [[\jlreq@open@bracket@pos]]} + \ifjlreq@burasage\directlua{jlreq.burasage = true}\else\directlua{jlreq.burasage = false}\fi + % \item後の行頭括弧のために仕込み． + \jlreq@saveoriginalcs{\list} + \jlreq@saveoriginalcs{\endlist} + \PushPostHook{par}{\jlreq@parhook@atbeginlist} + \pretocmd{\list}{\def\jlreq@parhook@atbeginlist{\ltjfakeparbegin}}{}{} + \apptocmd{\endlist}{\def\jlreq@parhook@atbeginlist{}}{}{} + \def\jlreq@parhook@atbeginlist{} +\else + % 非LuaTeXの場合はJFMの入れ替えと\everyparでの処理で対処． + % 行頭括弧に対して\inhibitglueを入れたりする命令を作る + % \jlreq@charlist@openingbracketsの各括弧に対して，\ifx\jlreq@nextchar 「1\fiみたいなのが並んだのを作る + \def\jlreq@tempa{} + \def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar#11\fi}\jlreq@do}} + \expandafter\jlreq@do\jlreq@charlist@openingbrackets\jlreq@endmark + % JFM glueの伸び縮みで行頭括弧が揃わないのを防ぐために常に\inhibitglueを入れる． + \ifthenelse{\equal{\jlreq@open@bracket@pos}{nibu_tentsuki}}{ + \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\hskip -.5\zw\inhibitglue}\noexpand\fi} + }{% zenkakunibu_nibu,zenkaku_tentsuki + \edef\jlreq@openbracket@hook@{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 \unexpanded{\inhibitglue}\noexpand\fi} + } + % source special対策 + \def\jlreq@openbracket@hook{\ifx\jlreq@nextchar\special\expandafter\jlreq@openbracket@hook@@\else\expandafter\jlreq@openbracket@hook@\fi} + \def\jlreq@openbracket@hook@@#1#2{#1{#2}\futurelet\jlreq@nextchar\jlreq@openbracket@hook} + \def\jlreq@jfmname@prefix{} + \jlreq@aftercls@addtodeletecs{\jlreq@jfmname@prefix} + \ifjlreq@burasage\edef\jlreq@jfmname@prefix{b\jlreq@jfmname@prefix}\fi + \ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{\edef\jlreq@jfmname@prefix{\jlreq@jfmname@prefix z}}{} + \ifx u\jlreq@engine\edef\jlreq@jfmname@prefix{u\jlreq@jfmname@prefix}\fi + \edef\jlreq@jfmname{\jlreq@jfmname@prefix jlreq} % JFMの名前 + \edef\jlreq@jfmnameg{\jlreq@jfmname@prefix jlreqg} % ゴシックなJFMの名前 + \AtBeginDocument{\PushPostHook{par}{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}} +\fi + +% 行頭の括弧は \jlreq@open@bracket@before@space \inhibitglue 「みたいにする． +\ifthenelse{\equal{\jlreq@open@bracket@pos}{zenkakunibu_nibu}}{ + \def\jlreq@open@bracket@before@space{\hskip\glueexpr-.5\zw\relax} +}{ + \def\jlreq@open@bracket@before@space{} +} + +\ifx l\jlreq@engine + \RequirePackage{luatexja-adjust} + \ltjenableadjust[lineend=extended,priority=true] + \ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=10}} + \ltjsetparameter{shrink_priority={kanjiskip=0,xkanjiskip=-30}} +\fi + +\ifx p\jlreq@engine + \def\jlreq@yokokanjiencoding{JY1} + \def\jlreq@tatekanjiencoding{JT1} +\fi +\ifx u\jlreq@engine + \def\jlreq@yokokanjiencoding{JY2} + \def\jlreq@tatekanjiencoding{JT2} +\fi +\ifx l\jlreq@engine + \def\jlreq@yokokanjiencoding{JY3} + \def\jlreq@tatekanjiencoding{JT3} +\fi +\expandafter\let\csname \jlreq@yokokanjiencoding/mc/m/n/10\endcsname\relax +\expandafter\let\csname \jlreq@tatekanjiencoding/mc/m/n/10\endcsname\relax +\jlreq@divide{\jlreq@jafontsize}{\jlreq@fontsize} +\edef\jlreq@jafontscale{\strip@pt\jlreq@resultdimen} +\jlreq@aftercls@addtodeletecs{\jlreq@jafontscale} +\ifx l\jlreq@engine + \DeclareFontShape{JY3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreq;script=latn;-kern}{} + \DeclareFontShape{JY3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreq;script=latn;-kern}{} + \DeclareFontShape{JT3}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdmcfont:jfm=jlreqv;script=latn;-kern}{} + \DeclareFontShape{JT3}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\ltj@stdgtfont:jfm=jlreqv;script=latn;-kern}{} +\else + \DeclareFontShape{\jlreq@yokokanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname}{} + \DeclareFontShape{\jlreq@yokokanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg}{} + \DeclareFontShape{\jlreq@tatekanjiencoding}{mc}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmname-v}{} + \DeclareFontShape{\jlreq@tatekanjiencoding}{gt}{m}{n}{<->s*[\jlreq@jafontscale]\jlreq@jfmnameg-v}{} +\fi +\@for\jlreq@encoding:=\jlreq@yokokanjiencoding,\jlreq@tatekanjiencoding\do{ + \@for\jlreq@shape:=n,it,sl,sc\do{ + \@for\jlreq@series:=m,b,bx,sb,c\do{ + \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ + \DeclareFontShape{\jlreq@encoding}{gt}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} + } + } + \@for\jlreq@series:=bx,b,sb\do{ + \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*gt/m/n}{} + } + \@for\jlreq@series:=m,c\do{ + \ifthenelse{\equal{\jlreq@shape}{n} \AND \equal{\jlreq@series}{m}}{}{ + \DeclareFontShape{\jlreq@encoding}{mc}{\jlreq@series}{\jlreq@shape}{<->ssub*mc/m/n}{} + } + } + } +} + +% 和文ファミリと欧文ファミリの連動 +\DeclareRobustCommand\rmfamily{% + \not@math@alphabet\rmfamily\mathrm + \romanfamily\rmdefault\kanjifamily\mcdefault\selectfont} +\DeclareRobustCommand\sffamily{% + \not@math@alphabet\sffamily\mathsf + \romanfamily\sfdefault\kanjifamily\gtdefault\selectfont} +\DeclareRobustCommand\ttfamily{% + \not@math@alphabet\ttfamily\mathtt + \romanfamily\ttdefault\kanjifamily\gtdefault\selectfont} + +% 数式フォント設定 +\ifx l\jlreq@engine\else + \DeclareSymbolFont{mincho}{\jlreq@yokokanjiencoding}{mc}{m}{n} + \DeclareSymbolFontAlphabet{\mathmc}{mincho} + \SetSymbolFont{mincho}{bold}{\jlreq@yokokanjiencoding}{gt}{m}{n} + \jfam\symmincho + \DeclareMathAlphabet{\mathgt}{\jlreq@yokokanjiencoding}{gt}{m}{n} +\fi +\AtBeginDocument{% + \reDeclareMathAlphabet{\mathrm}{\mathrm}{\mathmc}% + \reDeclareMathAlphabet{\mathbf}{\mathbf}{\mathgt}% +} + +% 和文間隔 +\DeclareRobustCommand*\　{\futurelet\jlreq@nextchar\jlreq@zenkakuspace@ignorespaces} +% 後続の空白を無視する処理 +\edef\jlreq@zenkakuspace@ignorespaces{% + \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@zenkakuspace@ignorespaces@\else\expandafter\jlreq@zenkakuspace@main\fi}% +} +\expandafter\def\expandafter\jlreq@zenkakuspace@ignorespaces@\space{\　} +\def\jlreq@tempa{} +\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifnum\lastnodechar=`#1 1\fi}\jlreq@do}} +\expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark +\edef\@tempa{\noexpand\ifnum0\expandonce{\jlreq@tempa}>0 } +\expandafter\DeclareRobustCommand\expandafter*\expandafter\jlreq@zenkakuspace@main\expandafter{\@tempa + \hskip 1\zw\hbox{}% + \jlreq@lastnodechar=`　 + \expandafter\jlreq@fixjfm + \else\expandafter　\fi +} +\ifx l\jlreq@engine + { + \catcode`　=\active + \global\let　=\jlreq@zenkakuspace@main + } + \AtBeginDocument{\catcode`　=\active} +\fi + +% \jaspace +\DeclareRobustCommand*{\jaspace}[1]{% + \ifcsname jlreq@jaspace@#1\endcsname\csname jlreq@jaspace@#1\endcsname + \else\ClassError{jlreq}{unknown jaspace: #1}{\@ehc}\fi +} +\def\jlreq@jaspace@zenkaku{\hskip\glueexpr 1\zw\relax} +\def\jlreq@jaspace@nibu{\hskip\glueexpr .5\zw\relax} +\def\jlreq@jaspace@shibu{\hskip\glueexpr .25\zw\relax} + +% 区切り約物．\？ みたいな命令を作る．直後の空きが自動で入る． +% \？*とすると文中の？として扱われる． +\def\jlreq@tempa{} +\def\jlreq@do#1{\jlreq@ifendmark{#1}{}{\appto\jlreq@tempa{\ifx\jlreq@nextchar #11\fi}\jlreq@do}} +\expandafter\jlreq@do\jlreq@charlist@closingbrackets\jlreq@endmark +\edef\jlreq@dividingpunctuationmarkscommand{% + \noexpand\ifnum 0\expandonce{\jlreq@tempa}>0 \unexpanded{\expandafter\ignorespaces\else\expandafter\　\fi}% +} +\def\jlreq@do#1{% + \jlreq@ifendmark{#1}{}{ + \expandafter\DeclareRobustCommand\expandafter*\csname #1\endcsname{% + \jlreq@ifstar + {\hskip .25\zw #1\hskip .25\zw\ignorespaces}% + {#1\futurelet\jlreq@nextchar\jlreq@dividingpunctuationmarkscommand}% + } + \jlreq@do + } +} +\expandafter\jlreq@do\jlreq@charlist@dividingpunctuationmarks\jlreq@endmark + +% \baselineskipの計算 +% いったん文字サイズを変更（(u)platexの際にzh/zwをきちんとするため） +\@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@fontsize}% +\newdimen\jlreq@baselineskip +\ifx l\jlreq@engine + \setlength{\jlreq@baselineskip}{% + \dimexpr\directlua{ + local act = string.char(92) + local s = [[\jlreq@option@baselineskip]] + s = s:gsub("Q",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw") + tex.print(s) + }\relax + }% +\else + \setlength{\jlreq@baselineskip}{\dimexpr\jlreq@option@baselineskip\relax} +\fi +\ifdim\jlreq@fontsize>\jlreq@baselineskip + \ClassError{jlreq}{The baselineskip is less than fontsize}{\@ehc}% +\fi +\ifthenelse{\lengthtest{\jlreq@baselineskip<1.5\zw} \OR \lengthtest{\jlreq@baselineskip>2\zw}}{ + \jlreq@note{行間は二分以上全角以下が望ましい (2.4.2.d 注3)．} +}{} + +\emergencystretch 3\jlreq@gol + +%.. 文字サイズ変更 +\def\jlreq@setfontsizehook{} +\jlreq@saveoriginalcs{\set@fontsize} +\apptocmd{\set@fontsize}{\expandafter\def\expandafter\size@update\expandafter{\size@update\jlreq@setfontsizehook}}{}{} +\appto\jlreq@setfontsizehook{\ifdim\parindent>0pt \setlength{\parindent}{1\zw}\fi} +\ifx l\jlreq@engine + \@tempskipa=\ltjgetparameter{kanjiskip} + \ifdim\@tempskipa=\maxdimen\else + \appto\jlreq@setfontsizehook{% + \ltj@setpar@global + \ltjsetkanjiskip\jlreq@kanjiskip + \@tempskipa=\ltjgetparameter{xkanjiskip}% + \ifdim\@tempskipa>0pt + \ltjsetxkanjiskip\jlreq@xkanjiskip + \fi + } + \fi +\else + \appto\jlreq@setfontsizehook{% + \kanjiskip=\jlreq@kanjiskip + \ifdim\xkanjiskip>0pt + \xkanjiskip=\jlreq@xkanjiskip + \fi + } +\fi + +% \jafontsize +\ifdim\jlreq@fontsize=\jlreq@jafontsize + \let\jafontsize=\fontsize +\else + \def\@tempa#1{ + \DeclareRobustCommand*{\jafontsize}[2]{% + \begingroup + \jlreq@iffloat{##1}{% + \edef\jlreq@do{\noexpand\fontsize{\strip@pt\dimexpr#1\dimexpr##1pt\relax\relax}}% + }{% + \edef\jlreq@do{\noexpand\fontsize{\the\dimexpr#1\dimexpr##1\relax\relax}}% + }% + \expandafter\endgroup + \jlreq@do{##2}% + } + } + \jlreq@divide{\jlreq@fontsize}{\jlreq@jafontsize} + \edef\jlreq@do{\noexpand\@tempa{\strip@pt\jlreq@resultdimen}} + \jlreq@do +\fi + +\renewcommand{\normalsize}{% + \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@baselineskip}% + \abovedisplayskip 1.1\jlreq@fontsize \@plus .3\jlreq@fontsize \@minus .4\jlreq@fontsize + \abovedisplayshortskip \z@ \@plus .3\jlreq@fontsize + \belowdisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize + \belowdisplayshortskip \belowdisplayskip + \let\@listi\@listI} + +\if@tate\tate\fi % ここで発行しておく +\mcfamily\selectfont\normalsize +\setbox\jlreq@tempboxa\hbox{阿} +\setlength\Cht{\ht\jlreq@tempboxa} +\setlength\Cdp{\dp\jlreq@tempboxa} +\setlength\Cwd{\wd\jlreq@tempboxa} +\setlength\Cvs{\baselineskip} +\setlength\Chs{\wd\jlreq@tempboxa} + +% 4.1.3.a +% 2.5.2 \baselineskipは一定の方がよい？ +% \@listiは再定義しないようにした．（\normalsizeと共用でJLReq通りだと思う．） +\newcommand{\footnotesize}{% + \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e + \abovedisplayskip .6\jlreq@fontsize \@plus.2\jlreq@fontsize \@minus.4\jlreq@fontsize + \abovedisplayshortskip \z@ \@plus.1\jlreq@fontsize + \belowdisplayshortskip .3\jlreq@fontsize \@plus.1\jlreq@fontsize \@minus.2\jlreq@fontsize + \belowdisplayskip \abovedisplayskip} +% tsize10.cloの引数を，そのまま\jlreq@fontsize/\jlreq@baselineskipでスケーリングしているだけ． +\newcommand{\small}{% + % jsarticleのもの + \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@baselineskip/17\relax}% + \abovedisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize + \abovedisplayshortskip \z@ \@plus.3\jlreq@fontsize + \belowdisplayshortskip \abovedisplayshortskip + \belowdisplayskip \abovedisplayskip} +\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@baselineskip/17\relax}} +\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@baselineskip/17\relax}} +\newcommand{\large}{\@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@baselineskip}} +\newcommand{\Large}{\@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@baselineskip/17\relax}} +\newcommand{\LARGE}{\@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@baselineskip/17\relax}} +\newcommand{\huge}{\@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@baselineskip/17\relax}} +\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@baselineskip/17\relax}} + +%. plextから一部拝借 +% オプションも*もない\rensuji（コピペ） +\DeclareRobustCommand{\jlreq@rensuji}[1]{% + \ifvmode\leavevmode\fi + \jlreq@ifydir{\hbox{#1}}{% + \hskip 0pt plus 0.25\zw minus 0pt % \rensujiskipは固定値 + \setbox\jlreq@tempboxa=\hbox{\yoko#1}% + \@tempdima=\dimexpr\ht\jlreq@tempboxa+\dp\jlreq@tempboxa\relax + \vrule\@width\z@ \@height.5\@tempdima \@depth.5\@tempdima + \hbox to 1\zw{\yoko\hss#1\hss}% + \hskip 0pt plus 0.25\zw minus 0pt +}} +\def\jlreq@Kanji#1{\expandafter\kansuji\csname c@#1\endcsname} + +% このあたりはtarticleと同じ +\setlength\lineskip{.1\zh} +\setlength\normallineskip{.1\zh} +\renewcommand{\baselinestretch}{} +\setlength\parskip{0\p@ \@plus \p@} +\setlength\parindent{1\zw} +\@lowpenalty 51 +\@medpenalty 151 +\@highpenalty 301 + +% 変数定義（他にも散らばっているけど） +% 罫線の太さ（4.4.3.c 注1） +\newdimen\jlreq@omotekeiwidth +\jlreq@omotekeiwidth=0.12mm +\newdimen\jlreq@chuubusokeiwidth +\jlreq@chuubusokeiwidth=0.25mm +\newdimen\jlreq@urakeiwidth +\jlreq@urakeiwidth=0.4mm +% 脚注のインデント +\newdimen\jlreq@footnoteindent + +%\RequirePackage{jlreq-debug} + +%. ページレイアウト +% landscapeの場合縦横をひっくり返す +\if@landscape + \jlreq@swap{\paperwidth}{\paperheight} +\fi + +% \pdfpagewidthとか設定 +\ifx l\jlreq@engine + \let\jlreq@pagewidth=\pagewidth + \let\jlreq@pageheight=\pageheight +\else + \let\jlreq@pagewidth=\pdfpagewidth + \let\jlreq@pageheight=\pdfpageheight +\fi +\setlength{\jlreq@pagewidth}{\paperwidth} +\setlength{\jlreq@pageheight}{\paperheight} +\iftombow + \addtolength{\jlreq@pagewidth}{2in} + \addtolength{\jlreq@pageheight}{2in} +\fi + + +\ifx l\jlreq@engine + \def\jlreq@expand@speciallength#1{% + % zhやzwを\zhや\zwにする． + \directlua{ + local act = string.char(92) + local s = [[#1]] + s = s:gsub("zw",act .. "zw"):gsub("zh",act .. "zh") + tex.print(s) + }% + } +\else + \def\jlreq@expand@speciallength#1{#1} +\fi +\def\jlreq@speciallength#1{\dimexpr\jlreq@expand@speciallength{#1}\relax} + +%.. 二段組み用パラメータ +\setlength{\columnsep}{\jlreq@speciallength{\jlreq@option@column@gap}} +\setlength{\columnseprule}{0pt} + +%.. 傍注（4.2.7） +\begingroup + \footnotesize + \setlength{\jlreq@tempdima}{\jlreq@speciallength{\jlreq@option@sidenote@length}} + \jlreq@tempdimb=1\zw + \divide\jlreq@tempdima\jlreq@tempdimb + \multiply\jlreq@tempdima\jlreq@tempdimb + \edef\jlreq@do{ + \noexpand\setlength{\noexpand\marginparwidth}{\the\jlreq@tempdima} + \noexpand\setlength{\noexpand\marginparpush}{\the\dimexpr 0.5\zw\relax} % 同上：4.2.7.g + } + \expandafter\endgroup +\jlreq@do +\ifdim\marginparwidth>0pt + \setlength{\marginparsep}{2\zw} % フォントサイズ×2（4.2.7：特に問題に～e） +\else + \setlength{\marginparsep}{0pt} +\fi + +\ifdim\marginparwidth>0pt + \ifnum 0\ifdim\marginparwidth>25\zw 1\fi\ifdim\marginparwidth<15\zw 1\fi>0 + \jlreq@note{並列注の字詰め方向の長さ（行長）は，15字から20字くらいである．ケースによっては25字程度にする場合もある (4.2.7)．} + \fi +\fi +% 縦書きの時は脚注に固定 +% (TODO: 頭注） +\if@tate\@mparswitchfalse\fi + +\setlength{\topskip}{1\zw} % フォントサイズと一致させる +\ifx\jlreq@option@headfoot@verticalpos\@empty + \if@tate\def\jlreq@option@headfoot@verticalpos{1zw} + \else\def\jlreq@option@headfoot@verticalpos{2zw}\fi +\fi +\setlength{\headsep}{\jlreq@speciallength{\jlreq@option@headfoot@verticalpos}} +\ifdim\headsep<1\zw\relax\jlreq@note{基本版面との上下方向の最低の空き量を，基本版面の文字サイズの全角アキとする (26.1.a)．}\fi +\if@tate + \if@twocolumn + \addtolength{\headsep}{\dimexpr\marginparwidth + \marginparsep\relax} + \fi +\else + \addtolength{\headsep}{-\dimexpr\topskip - \Cht\relax} +\fi +\setlength{\headheight}{1\zw} + +% \textwidthと\textheightのデフォルト値は縦横ともに0.75倍（調整が入る）． +%.. \textwidth：文字送り方向の行長 +% 二段の場合は最初の段の頭から次の段の後まで +% 一度\textwidthに一行の長さの文字数を入れる（段組の場合でも） +\newif\ifjlreq@determine@kihonhanmen@warning@first +\jlreq@determine@kihonhanmen@warning@firsttrue +\def\jlreq@determine@kihonhanmen@warning{ + \ifjlreq@determine@kihonhanmen@warning@first + \jlreq@note{基本版面は，a. サイズの決定 b. 仕上りサイズに対する基本版面の配置位置の決定 という手順で行う (2.4.1)．} + \jlreq@determine@kihonhanmen@warning@firstfalse + \fi +} +\jlreq@aftercls@addtodeletecs{\jlreq@determine@kihonhanmen@warning} +\jlreq@aftercls@addtodeleteif{\ifjlreq@determine@kihonhanmen@warning@first} +\@tempdima=1\zw +\ifx\jlreq@option@line@length\@empty + \if@tate + \ifnum 0\ifx\jlreq@option@head@space\@empty 1\fi\ifx\jlreq@option@foot@space\@empty 1\fi>0 + \setlength{\textwidth}{0.75\paperheight} + \divide\textwidth\@tempdima\multiply\textwidth\@tempdima + \else + \jlreq@determine@kihonhanmen@warning + \setlength{\textwidth}{\dimexpr\paperheight - \jlreq@option@head@space - \jlreq@option@foot@space \relax} + \fi + \else + \ifnum 0\ifx\jlreq@option@gutter\@empty 1\fi\ifx\jlreq@option@fore@edge\@empty 1\fi>0 + \setlength{\textwidth}{0.75\paperwidth} + \divide\textwidth\@tempdima\multiply\textwidth\@tempdima + \else + \jlreq@determine@kihonhanmen@warning + \setlength{\textwidth}{\dimexpr\paperwidth - \jlreq@option@gutter - \jlreq@option@fore@edge\relax} + \fi + \fi + \if@twocolumn + \addtolength{\textwidth}{\dimexpr-2\marginparwidth - 2\marginparsep\relax} + \setlength{\textwidth}{\dimexpr(\textwidth - \columnsep)/2\relax} + \else + \addtolength{\textwidth}{\dimexpr-\marginparwidth - \marginparsep\relax} + \fi +\else + \setlength{\textwidth}{\jlreq@speciallength{\jlreq@option@line@length}} + \divide\textwidth\@tempdima + \if@tate + \ifnum\number\textwidth>52 + \jlreq@note{一行の長さは52文字以下が望ましい (2.4.2.c 注2)．} + \fi + \else + \ifnum\number\textwidth>40 + \jlreq@note{一行の長さは40文字以下が望ましい (2.4.2.c 注2)．} + \fi + \fi + \multiply\textwidth\@tempdima +\fi +\if@twocolumn + \setlength{\textwidth}{\dimexpr2\textwidth + \columnsep\relax} +\fi + + +%.. \textheight：行送り方向の長さ +% 一番上（直後に\topskip由来が入る）から最終行のベースラインまでの長さ． +% \topskipが十分ある時は先頭行のベースラインから最終行のベースライン＋\topskip +\def\jlreq@adjusttextheight{ + \addtolength{\textheight}{-\topskip} + \divide\textheight\baselineskip \multiply\textheight\baselineskip + \addtolength{\textheight}{\topskip} +} +\jlreq@aftercls@addtodeletecs{\jlreq@adjusttextheight} +\ifx\jlreq@option@number@of@lines\@empty + \if@tate + \ifnum 0\ifx\jlreq@option@gutter\@empty 1\fi\ifx\jlreq@option@fore@edge\@empty 1\fi>0 + \setlength{\textheight}{0.75\paperwidth} + \jlreq@adjusttextheight + \else + \jlreq@determine@kihonhanmen@warning + \setlength{\textheight}{\dimexpr\paperwidth - \jlreq@option@gutter - \jlreq@option@fore@edge + \topskip - 1\zw\relax} + \fi + \else + \ifnum 0\ifx\jlreq@option@head@space\@empty 1\fi\ifx\jlreq@option@foot@space\@empty 1\fi>0 + \setlength{\textheight}{0.75\paperheight} + \jlreq@adjusttextheight + \else + \jlreq@determine@kihonhanmen@warning + \setlength{\textheight}{\dimexpr\paperheight + 2\topskip - 1\zh - \Cht - \jlreq@option@head@space - \jlreq@option@foot@space\relax} + \fi + \fi +\else + \setlength{\textheight}{\dimexpr\numexpr\jlreq@option@number@of@lines\relax\baselineskip - \baselineskip + \topskip\relax} +\fi + +%.. 横 +\def\jlreq@setsidemargin@by@gutter#1{ + \if@tate + \setlength{\evensidemargin}{#1} + \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight - \evensidemargin + \topskip - \Cht\relax} + \addtolength{\evensidemargin}{\Cdp} + \else + \setlength{\oddsidemargin}{#1} + \if@twocolumn + \addtolength{\oddsidemargin}{\dimexpr\marginparsep + \marginparwidth\relax} + \fi + \setlength{\evensidemargin}{\dimexpr\paperwidth - \textwidth - \oddsidemargin\relax} + \fi +} +\def\jlreq@setsidemargin@by@fore@edge#1{ + \jlreq@setsidemargin@by@gutter{#1} + \@tempdima=\evensidemargin + \evensidemargin=\oddsidemargin + \oddsidemargin=\@tempdima + \ifjlreq@determine@kihonhanmen@warning@first + \jlreq@note{基本版面の配置はのどの空き量を指定する (2.4.1.b)．} + \fi +} + +\ifx\jlreq@option@gutter\@empty + \ifx\jlreq@option@fore@edge\@empty + % 中央配置 + \if@tate + \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textheight + \topskip\relax} + \else + \if@twocolumn + \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textwidth\relax} + \else + \setlength{\oddsidemargin}{\dimexpr\paperwidth - \textwidth - \marginparsep - \marginparwidth\relax} + \fi + \fi + \setlength{\oddsidemargin}{.5\oddsidemargin} + \ifnum0\if@twocolumn1\fi\if@tate1\fi>0 + \setlength{\evensidemargin}{\oddsidemargin} + \else + \setlength{\evensidemargin}{\dimexpr\oddsidemargin + \marginparsep + \marginparwidth\relax} + \fi + \else + \jlreq@setsidemargin@by@fore@edge{\jlreq@speciallength{\jlreq@option@fore@edge}} + \fi +\else + \jlreq@setsidemargin@by@gutter{\jlreq@speciallength{\jlreq@option@gutter}} + \ifx\jlreq@option@fore@edge\@empty\else + \ifjlreq@determine@kihonhanmen@warning@first\else + \ClassWarningNoLine{jlreq}{fore_edge is ignored} + \fi + \fi +\fi +\addtolength{\oddsidemargin}{-1in} +\addtolength{\evensidemargin}{-1in} + +%.. 縦 +% \topmarginに全体の頭からテキストの頭までの長さを入れる +% 天の値からtopmarginを設定する +\def\jlreq@settopmarginbyhead#1{ + \if@tate + \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in\relax} + \if@twocolumn + \addtolength{\topmargin}{\dimexpr\marginparwidth + \marginparsep\relax} + \fi + \jlreq@note{縦組の場合は地の空き量を指定する (2.4.1.b)．} + \else + \setlength{\topmargin}{\dimexpr #1 - \headsep - \headheight - 1in - \topskip + \Cht\relax} + \fi +} +\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyhead} +% 地の値から +\def\jlreq@settopmarginbyfoot#1{ + \if@tate + \setlength{\topmargin}{\dimexpr\paperheight - \textwidth - \headsep - \headheight - 1in - #1 - \marginparsep - \marginparwidth\relax} + \else + \jlreq@note{横組の場合は天の空き量を指定する (2.4.1.b)．} + \setlength{\topmargin}{\dimexpr\paperheight - \textheight + \topskip - 1\zh - \headsep - \headheight - 1in - #1\relax} + \fi +} +\jlreq@aftercls@addtodeletecs{\jlreq@settopmarginbyfoot} +\ifx\jlreq@option@head@space\@empty + \ifx\jlreq@option@foot@space\@empty + \if@tate + \if@twocolumn + \jlreq@settopmarginbyfoot{\dimexpr(\paperheight - \textwidth - 2\marginparwidth - 2\marginparsep)/2\relax} + \else + \jlreq@settopmarginbyfoot{\dimexpr(\paperheight - \textwidth - \marginparwidth - \marginparsep)/2\relax} + \fi + \else + \jlreq@settopmarginbyhead{\dimexpr(\paperheight - (\textheight - \topskip + 1\zh))/2\relax} + \fi + \else + \jlreq@settopmarginbyfoot{\jlreq@speciallength{\jlreq@option@foot@space}} + \fi +\else + \ifx\jlreq@option@foot@space\@empty + \jlreq@settopmarginbyhead{\jlreq@speciallength{\jlreq@option@head@space}} + \else + % 両方指定されていたら，縦書きは地を，横書きは天を使う + \if@tate + \jlreq@settopmarginbyfoot{\jlreq@speciallength{\jlreq@option@foot@space}} + \ifx\jlreq@option@line@length\@empty\else + \ClassWarningNoLine{jlreq}{head_space is ignored} + \fi + \else + \jlreq@settopmarginbyhead{\jlreq@speciallength{\jlreq@option@head@space}} + \ifx\jlreq@option@number@of@lines\@empty\else + \ClassWarningNoLine{jlreq}{foot_space is ignored} + \fi + \fi + \fi +\fi + +%.. 下 +\setlength{\footskip}{\dimexpr\headsep + \if@tate\marginparwidth + \marginparsep\else\topskip - \Cht\fi + \headheight\relax} +% \maxdepth + \topskip = フォントサイズ×1.5（だってさ） +\setlength{\maxdepth}{\dimexpr1.5\zw - \topskip\relax} + +%. 見出し関係 (4.1) +% \clear***page +\newcommand*{\cleartooddpage}{% + \clearpage + \ifodd\c@page\else + \hbox{}% + \newpage + \if@twocolumn\hbox{}\newpage\fi + \fi +} +\newcommand*{\cleartoevenpage}{% + \clearpage + \ifodd\c@page + \hbox{}% + \newpage + \if@twocolumn\hbox{}\newpage\fi + \fi +} + +% 扉見出しと別行見出しについては，\ -> \jlreq@headingcs@csname -> 本体と +% 二段構えで展開されるようにする．一度の展開で\parが出るのを防ぐため． +% 一度展開を\longなしマクロに渡されると破綻するので．（そういうパッケージが存在する．） + +% jlreq@heading@maketoc@<命令名>が\tableofcontents用の出力をするために呼び出される． +% #1=*または空（見出し命令に*がついていたかで分岐），#2=ラベル，#3=running head +% デフォルトでは\<命令名>markと\addcontentslineが必要ならば呼ばれる． + +% 見出しの直前に実行される +\newcommand*{\jlreq@hook@beforeheadings}[1]{} +% 見出し名一覧を格納する +\def\jlreq@heading@allheadings{} + +% 目次を出力する命令\l@<命令名>を作る命令を作る．{1 = 命令名}{2 = レベル}{3 = ラベルのフォーマット} +% 結果は\jlreq@resultに入る． +\def\jlreq@heading@make@l@#1#2#3{% + \@ifundefined{l@#1}{% + % 長さは適当に計測する + \begingroup + % ちょっと大きめで計測しておく + \csname c@#1\endcsname=9 + \setbox\jlreq@tempboxa=\hbox{#3}% + \jlreq@tempdima=\wd\jlreq@tempboxa + \csname c@#1\endcsname=26 + \setbox\jlreq@tempboxa=\hbox{#3}% + \ifdim\jlreq@tempdima<\wd\jlreq@tempboxa + \jlreq@tempdima=\wd\jlreq@tempboxa + \fi + % \numexprは四捨五入 + \jlreq@tempdimb=\dimexpr\the\numexpr\jlreq@tempdima/\dimexpr 1\zw\relax + 2\relax\zw\relax + \edef\jlreq@do{% + \unexpanded{\def\jlreq@result}{% + \noexpand\def\expandonce{\csname l@#1\endcsname}{\unexpanded{\@dottedtocline{#2}{0\zw}}{\the\jlreq@tempdimb}}% + }% + }% + \expandafter\endgroup + \jlreq@do + }{\def\jlreq@result{}}% +} + +\def\jlreq@heading@make@maketoc#1#2{% + % 目次への出力をするマクロ．外部に切り出しておく． + \@ifundefined{jlreq@heading@maketoc@#1}{% + % {1 = *}{2 = ラベル}{3 = running head} + \expandafter\def\csname jlreq@heading@maketoc@#1\endcsname##1##2##3{% + \ifnum0\jlreq@ifempty{##1}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0\else + \csname #1mark\endcsname{##3}% + \addcontentsline{toc}{#1}{\protect\numberline{##2}##3}% + \fi + }% + }{}% +} +%.. 中/半扉見出し +% addcontentslineに渡すやつ：番号出すのと出さないの +\newcommand{\DeclareTobiraHeading}[3]{% + \def\jlreq@do{\@removeelement{#1}}% + \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% + \appto{\jlreq@heading@allheadings}{,#1}% + \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% + \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% + \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewTobiraHeading}% + \@ifundefined{c@#1}{\newcounter{#1}}{}% + \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% + \jlreq@heading@make@maketoc{#1}{#2}% + \begingroup + \let\jlreq@contents@label@format=\@undefined + \let\jlreq@format=\@undefined + \edef\jlreq@label@format{\expandonce{\csname the#1\endcsname}}% + \def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}% + \def\jlreq@pagestyle{empty}% + \jlreq@parsekeyval[DeclareTobiraHeading:#1]{ + {label_format}{\def\jlreq@label@format{##1}} + {format}{\def\jlreq@format####1####2{##1}} + {pagestyle}{\def\jlreq@pagestyle{##1}} + {type}[han,naka]{% + \jlreq@switch{##1}{ + {han}{\def\jlreq@heading@clearpage{\clearpage}} + {naka}{\def\jlreq@heading@clearpage{\clearpage\hbox{}\clearpage}} + }% + } + }{#3}% + \def\jlreq@do{}% + \ifx\jlreq@format\@undefined + \def\jlreq@format##1##2{##1##2}% + \fi + \edef\jlreq@formatwlabel{\noexpand\jlreq@format{\expandonce{\jlreq@label@format}}}% + \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% + \eappto\jlreq@do{\expandonce{\jlreq@result}}% + \edef\jlreq@do{% + \expandonce{\jlreq@do}% + \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}[####1]####2{% + \unexpanded{\ifnum#2>\c@secnumdepth\else}% + \unexpanded{\refstepcounter{#1}}% + \noexpand\fi + \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{}{\expandonce{\jlreq@label@format}}{####1}% + \unexpanded{\ifnum#2>\c@secnumdepth\relax}% + \expandonce{\jlreq@format{}{##1}}% + \noexpand\else + \expandafter\expandonce\expandafter{\jlreq@formatwlabel{##2}}% + \noexpand\fi + \noexpand\@afterheading + \expandonce{\jlreq@heading@clearpage}% + \unexpanded{\if@restonecol\twocolumn\fi}% + }% + \noexpand\def\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}####1{% + \expandonce{\jlreq@format{}{##1}}% + \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{*}{\expandonce{\jlreq@label@format}}{####1}% + \noexpand\@afterheading + \expandonce{\jlreq@heading@clearpage}% + \unexpanded{\if@restonecol\twocolumn\fi}% + }% + \noexpand\def\expandonce{\csname jlreq@headingcs@#1\endcsname}{% + % 改丁．これでよいのかな． + \unexpanded{\if@twocolumn\onecolumn\@restonecoltrue\else\@restonecolfalse\fi\cleartooddpage}% + \ifx\jlreq@pagestyle\@empty\else\noexpand\thispagestyle{\expandonce{\jlreq@pagestyle}}\fi + \noexpand\secdef{\expandonce{\csname jlreq@TobiraHeading@start@#1\endcsname}}{\expandonce{\csname jlreq@TobiraHeading@start@s@#1\endcsname}}}% + \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq@headingcs@#1\endcsname}}% + }% + \expandafter\endgroup + \jlreq@do +} + +\newcommand{\NewTobiraHeading}[3]{% + \expandafter\@ifdefinable\csname #1\endcsname{\DeclareTobiraHeading{#1}{#2}{#3}}% +} +\newcommand{\RenewTobiraHeading}[3]{% + \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareTobiraHeading{#1}{#2}{#3}}% +} +\newcommand{\ProvideTobiraHeading}[3]{% + \@ifundefined{#1}{\DeclareTobiraHeading{#1}{#2}{#3}}{}% +} + +%.. 別行見出し +% \jlreq@BlockHeading@start：別行見出しを出力する命令． +% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = フォーマット関連}{5 = 全体フォーマット}*{見出し}[副題] +% スペース関連={配置:lcr（左中央右）}{字下げ（寸法）}{字上げ（寸法）}{前空き}{後空き}{行取りの行数}{空か*か，偶数ページでも改ページを許可するならば空} +% 前/後空きはprefixにa:/s:/r:が入る．r:は空きがその値そのものになる．a:/s:は行取りに加えて入る．a:で指定された空きはページ行頭では入らない +% 後空きの時はs:は指定できない． +% フォーマット関連： +% フォーマット関連={ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット（ラベル無し）}{副題フォーマット}{副題フォーマット（ラベル無し）}{見出し全体のフォーマット} +% 見出しそのものは「全体フォーマット」に従い出力される．パラメータトークン#1を含み，#1=見出し本体：スペース関連と上の「見出し全体のフォーマット」に基づいて整形される． +% 見出し全体のフォーマット内では#1=ラベル，#2=見出し文字列，#3=副題，それぞれ各々のフォーマットに基づき整形される． +% ラベルフォーマットでは#1=カウンタ名，見出し文字列フォーマットでは#1=見出し文字列，副題フォーマットでは#1=副題 +% ラベルのみのフォーマットは目次に使われる． +\newcommand{\jlreq@BlockHeading@start}[5]{% + \edef\jlreq@BlockHeading@start@format{\unexpanded{#4}}% この二つは\parを含むかもしれないので引数渡しはしない（後の\@ifstarで詰まる） + \edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#5}}% + \jlreq@BlockHeading@start@{#1}{#2}{#3}% +} +% {1 = 命令}{2 = レベル}{3 = スペース関連} +\newcommand{\jlreq@BlockHeading@start@}[3]{% + \@ifstar{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{}}}% +} +% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出し} +\long\def\jlreq@BlockHeading@start@@#1#2#3#4[#5]#6{% + \jlreq@ifnextchar[{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}[]}% +} + +% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題] +\long\def\jlreq@BlockHeading@start@@@#1#2#3#4#5#6[#7]{% + \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\expandonce{\jlreq@BlockHeading@start@format}}{\expandonce{\jlreq@BlockHeading@start@totalformat}}}% + \jlreq@do{#4}{#5}{#6}{#7}% +} + +% {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = フォーマット群}{5 = 全フォーマット}{6 = *}{7 = running head}{8 = 見出し}{9 = 副題} +\long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8#9{% + \edef\jlreq@tempa##1##2##3##4##5##6##7{% + \unexpanded{\jlreq@BlockHeading@start@makeoutput{#1}{#2}}{{##1}{##2}{##3}}\unexpanded{{#4}{#6}{#7}{#8}{#9}}% + \unexpanded{\def\jlreq@tempb}{{##4}{##5}{##6}{##7}}% 縦方向空き + }% + \jlreq@tempa#3% + \global\advance\jlreq@BlockHeading@spaces@current@count by 1 + \appto\jlreq@BlockHeading@spaces@current@sequence{_#1}% + \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% + \expandonce{\jlreq@resultb}% + }% + \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% + \expandonce{\jlreq@tempb}% + }% + \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@format@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% + \unexpanded{#5}% + }% + \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@BlockHeading@spaces@current@count\endcsname{% + \expandonce{\jlreq@resulta}% + }% + \expandafter\xdef\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count\endcsname{}% + \ifx\jlreq@BlockHeading@spaces@headingslist\@empty + \expandafter\jlreq@BlockHeading@spaces@outputwospace + \expandafter\ignorespaces + \else + \expandafter\jlreq@BlockHeading@start@afterheading + \fi +} + +\def\jlreq@BlockHeading@start@afterheading{\futurelet\jlreq@nextchar\jlreq@BlockHeading@start@afterheading@} +\edef\jlreq@BlockHeading@start@afterheading@{% + \noexpand\ifx\expandonce{\space}\unexpanded{\jlreq@nextchar\expandafter\jlreq@BlockHeading@start@afterheading@@}% + \unexpanded{\else\expandafter\jlreq@BlockHeading@start@afterheading@@@\fi}% +} +% スペースを読み飛ばす +\expandafter\def\expandafter\jlreq@BlockHeading@start@afterheading@@\space{\jlreq@BlockHeading@start@afterheading} +\def\jlreq@BlockHeading@start@afterheading@@@{% + \def\jlreq@do{\jlreq@BlockHeading@spaces@output}% + \@for\@tempa:=\jlreq@BlockHeading@allheadings\do{% + \expandafter\ifx\csname\@tempa\endcsname\jlreq@nextchar\def\jlreq@do{}\fi + }% + % \jlreq@BlockHeading@HeadingSpaces@ignoretokens内のものは特別扱いする + \expandafter\@tfor\expandafter\@tempa\expandafter:\expandafter=\jlreq@BlockHeading@HeadingSpaces@ignoretokens\do{% + \expandafter\ifx\@tempa\jlreq@nextchar + \def\jlreq@do{\jlreq@BlockHeading@start@afterheading@saveafter@cs}% + \fi + }% + \jlreq@do +} + +% コントロールシークエンスを保存 +\def\jlreq@BlockHeading@start@afterheading@saveafter@cs#1{% + \csgappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{#1}% + \jlreq@BlockHeading@start@afterheading@saveafter@option +} +% オプションがあれば保存 +\def\jlreq@BlockHeading@start@afterheading@saveafter@option{% + \@ifnextchar[{\jlreq@BlockHeading@start@afterheading@saveafter@option@}{\jlreq@BlockHeading@start@afterheading@saveafter@arguments}% +} +\def\jlreq@BlockHeading@start@afterheading@saveafter@option@[#1]{% + \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{[#1]}}% + \jlreq@BlockHeading@start@afterheading@saveafter@arguments +} +% 引数を保存し続けるループ +\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments{% + \jlreq@ifnextchar\bgroup{\jlreq@BlockHeading@start@afterheading@saveafter@arguments@}{\jlreq@BlockHeading@start@afterheading}% +} +\def\jlreq@BlockHeading@start@afterheading@saveafter@arguments@#1{% + \csxappto{jlreq@BlockHeading@spaces@current@after@\the\jlreq@BlockHeading@spaces@current@count}{\unexpanded{{#1}}}% + \jlreq@BlockHeading@start@afterheading@saveafter@arguments +} + +% 特別扱いしたいマクロを並べる +\def\jlreq@BlockHeading@HeadingSpaces@ignoretokens{\label} + +% \jlreq@resultaにaux吐き出しとかを入れて，\jlreq@resultbに出力を入れる（縦方向調整なし） +% {1 = 命令}{2 = レベル}{3 = スペース関連（横方向のみ）}{4 = フォーマット群}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題} +\long\def\jlreq@BlockHeading@start@makeoutput#1#2#3#4#5#6#7#8{% + \begingroup + \ifnum0\jlreq@ifempty{#5}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0 + \def\jlreq@tempc{*}% + \else + \def\jlreq@tempc{}% + \fi + \long\def\jlreq@tempa##1##2##3##4##5##6##7{% + \long\def\jlreq@tempa{##1}% 素のラベルのフォーマットを取り出す + \edef\jlreq@tempb{\unexpanded{{##2}{##3}{##4}{##5}{##6}{##7}}{\expandonce{\jlreq@tempc}}}% 残り + }% + \jlreq@tempa#4% + \expandafter\jlreq@BlockHeading@start@makeoutput@@\jlreq@tempb{#7}{#8}% + \edef\jlreq@do{\noexpand\jlreq@BlockHeading@start@makeoutput@\unexpanded{#3}{\expandonce{\jlreq@result}}}% + \jlreq@do + \edef\jlreq@do{% + \unexpanded{\def\jlreq@resulta}{% + \expandafter\if\jlreq@tempc *\else\unexpanded{\refstepcounter{#1}}\fi + \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{\unexpanded{#5}}{\expandonce{\jlreq@tempa}}{\unexpanded{#6}}% + }% + \unexpanded{\def\jlreq@resultb}{% + \expandonce{\jlreq@result}% + }% + }% + \expandafter\endgroup + \jlreq@do +} + +% {1 = 配置(clr)}{2 = 字下げ}{3 = 字上げ}{4 = 出力} +\long\def\jlreq@BlockHeading@start@makeoutput@#1#2#3#4{% + \edef\jlreq@result{% + \noexpand\noindent + \jlreq@ifempty{#2}{}{\unexpanded{\hskip #2}}% + \noexpand\vbox{% + \noexpand\noindent + \ifx#1c\noexpand\centering\fi + \ifx#1r\noexpand\raggedleft\fi + \jlreq@ifempty{#2}{}{\unexpanded{\hsize=\dimexpr\hsize - #2\relax}}% + \jlreq@ifempty{#3}{}{\unexpanded{\hsize=\dimexpr\hsize - #3\relax}}% + \unexpanded{#4}}% + }% +} + +% {1 = ラベルフォーマット}{2 = 見出し文字列フォーマット}{3 = 見出し文字列フォーマット（ラベル無し）}{4 = 副題フォーマット}{5 = 副題フォーマット（ラベル無し）}{6 = 全体フォーマット}{7 = *}{8 = 見出し}{9 = 副題} +% \jlreq@resultに出力対象を入れる +\long\def\jlreq@BlockHeading@start@makeoutput@@#1#2#3#4#5#6#7#8#9{% + \begingroup + % \jlreq@tempaに{ラベル}{見出し}{副題}という形のものを入れる + \jlreq@ifempty{#7}{% + % ラベルあり + \long\def\jlreq@tempa{#1}% + \long\def\jlreq@tempb##1{#2}% + \jlreq@ifempty{#9}{\def\jlreq@tempc##1{}}{\long\def\jlreq@tempc##1{#4}}% + }{% + \long\def\jlreq@tempa{}% + \long\def\jlreq@tempb##1{#3}% + \jlreq@ifempty{#9}{\def\jlreq@tempc##1{}}{\long\def\jlreq@tempc##1{#5}}% + }% + \edef\jlreq@tempa{{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb{#8}}}{\expandonce{\jlreq@tempc{#9}}}}% + \long\def\jlreq@tempb##1##2##3{#6}% + \edef\jlreq@tempa{\noexpand\expandonce{\noexpand\jlreq@tempb\expandonce{\jlreq@tempa}}}% + \edef\jlreq@do{\unexpanded{\def\jlreq@result}{\jlreq@tempa}}% + \expandafter\endgroup + \jlreq@do +} + +\def\jlreq@BlockHeading@start@removecolumn#1:{#1} + +% 空き指定を解釈する．a:10pt -> \jlreq@resulta=a，\jlreq@resultb=10pt +\def\jlreq@BlockHeading@start@analyzespace#1:#2\jlreq@endmark{% + \jlreq@ifempty{#1}{% + \def\jlreq@resulta{}% + \def\jlreq@resultb{}% + }{% + \let\jlreq@resulta=#1% + \edef\jlreq@resultb{\expandonce{\jlreq@BlockHeading@start@removecolumn#2}}% + }% +} + +% 行取り処理 +% {1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}{4 = 偶数ページ改ページするなら空}{5 = 出力} +\long\def\jlreq@BlockHeading@start@gyodori#1#2#3#4#5{{% + \par + \jlreq@ifempty{#4}{\jlreq@setcurrentpage}{}% + \setbox\jlreq@tempboxa=\vbox{#5}% + % \jlreq@tempskip(a/b)に前/後ろに入れるべき値を入れる + % #1がa:ならばその値は\jlreq@tempskipaには足さず\jlreq@tempskipcに入れておく + \jlreq@tempskipa=0pt + \jlreq@tempskipc=0pt + \jlreq@BlockHeading@start@analyzespace#1:\jlreq@endmark + \let\jlreq@maeakitype=\jlreq@resulta + \let\jlreq@maeaki=\jlreq@resultb + \jlreq@BlockHeading@start@analyzespace#2:\jlreq@endmark + \let\jlreq@ushiroakitype=\jlreq@resulta + \let\jlreq@ushiroaki=\jlreq@resultb + \def\jlreq@lines{#3}% + % 両方強制指定の場合は行数を無視する． + \ifx r\jlreq@maeakitype\ifx r\jlreq@ushiroakitype\def\jlreq@lines{}\fi\fi + \setbox\jlreq@tempboxb=\hbox{阿}% + \ifx\jlreq@lines\@empty + \ifx\jlreq@maeaki\@empty\else + \jlreq@tempskipa=\glueexpr\jlreq@maeaki\relax + \fi + \ifx\jlreq@ushiroaki\@empty\else + \jlreq@tempskipb=\glueexpr\jlreq@ushiroaki\relax + \fi + \else + % 行取り時の前後の空きを足した値を\jlreq@tempdimaに入れる + \jlreq@tempdima=\glueexpr(#3\baselineskip - \baselineskip - \ht\jlreq@tempboxa - \dp\jlreq@tempboxa)\relax + \ifx\jlreq@maeakitype\@empty + \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2\relax + \else + \ifx a\jlreq@maeakitype + \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2\relax + \jlreq@tempskipc=\glueexpr\jlreq@maeaki\relax + \fi + \ifx s\jlreq@maeakitype + \jlreq@tempskipa=\glueexpr(\jlreq@tempdima + \dp\jlreq@tempboxb - \ht\jlreq@tempboxb)/2 + \jlreq@maeaki\relax + \jlreq@tempdima=\dimexpr\jlreq@tempdima + \jlreq@maeaki\relax + \fi + \ifx r\jlreq@maeakitype + \jlreq@tempskipa=\glueexpr\jlreq@maeaki\relax + \jlreq@tempdima=\dimexpr\jlreq@tempdima + \baselineskip - \dp\jlreq@tempboxb\relax + \fi + \fi + \ifx\jlreq@ushiroakitype\@empty + \jlreq@tempskipb=\glueexpr\jlreq@tempdima - \jlreq@tempskipa\relax + \else + \ifx a\jlreq@ushiroakitype + \jlreq@tempskipb=\glueexpr\jlreq@tempdima - \jlreq@tempskipa + \jlreq@ushiroaki\relax + \fi + \ifx r\jlreq@ushiroakitype + \jlreq@tempskipb=\glueexpr\jlreq@ushiroaki\relax + \jlreq@tempskipa=\glueexpr\jlreq@tempdima - \jlreq@tempskipb + \baselineskip - \ht\jlreq@tempboxb\relax + \fi + \fi + \fi + \jlreq@ifgluezero\jlreq@tempskipc{}{\vskip\jlreq@tempskipc\relax}% + \ifx r\jlreq@maeakitype\prevdepth=-1000pt\fi + \setbox\jlreq@tempboxa=\vbox{% + \jlreq@ifgluezero\jlreq@tempskipa{}{\vskip\jlreq@tempskipa}% + \unvbox\jlreq@tempboxa}% + \dp\jlreq@tempboxa=\dimexpr\dp\jlreq@tempboxa + \ht\jlreq@tempboxa\relax + \ht\jlreq@tempboxa=0pt + \box\jlreq@tempboxa + \jlreq@ifempty{#4}{\ifodd\jlreq@currentpage\nobreak\fi}{\nobreak}% + \ifx r\jlreq@ushiroakitype\prevdepth=-1000pt\else\prevdepth=0pt\fi + \jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}% + \edef\jlreq@do{% + \unexpanded{\def\jlreq@parhook@gyodori}{% + \noexpand\parskip=\the\parskip + \unexpanded{\def\jlreq@parhook@gyodori{}}% + }% + \unexpanded{\parskip=0pt plus 1pt}% + }% +\expandafter}\jlreq@do} +\PushPostHook{par}{\jlreq@parhook@gyodori} +\def\jlreq@parhook@gyodori{} + +% 行取り情報をゲットだぜ +% \jlreq@resultに{1 = 前空き}{2 = 後ろ空き}{3 = トータル行数}を入れる +% #2#3#4はそれぞれ前空き，後ろ開き，トータル行数のデフォルト値 +% *つきは\setkeys*を使う．[]はkeyvalのファミリー． +\def\jlreq@BlockHeading@gyodori@parsekeyval{% + \@ifstar{\jlreq@BlockHeading@gyodori@parsekeyval@{*}}{\jlreq@BlockHeading@gyodori@parsekeyval@{}}% +} +\def\jlreq@BlockHeading@gyodori@parsekeyval@#1{% + \@ifnextchar[{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}}{\jlreq@BlockHeading@gyodori@parsekeyval@@{#1}[jlreq@key]}% +} +\def\jlreq@BlockHeading@gyodori@parsekeyval@@#1[#2]#3#4#5#6{% + \begingroup + \def\jlreq@lines{#6}% + \def\jlreq@before@space{}% + \def\jlreq@before@lines{}% + \def\jlreq@after@space{}% + \def\jlreq@after@lines{}% + \jlreq@parsekeyval#1[#2]{ + {lines}{\def\jlreq@lines{##1}} + {before_space}{\def\jlreq@before@space{##1}} + {after_space}{\def\jlreq@after@space{##1}} + {before_lines}{% + \jlreq@iffirsttoken@ignorespaces{##1}{*}% + {\edef\jlreq@before@lines{s:\expandonce{\@gobble ##1}}}% + {\def\jlreq@before@lines{a:##1}}% + } + {after_lines}{\def\jlreq@after@lines{##1}} + }{#3}% + % before/after_lines優先 + \ifx\jlreq@before@space\@empty\else\edef\jlreq@before@space{r:\expandonce{\jlreq@before@space}}\fi + \ifx\jlreq@before@lines\@empty\else\edef\jlreq@before@space{\expandonce{\jlreq@before@lines}\baselineskip}\fi + \ifx\jlreq@before@space\@empty\def\jlreq@before@space{#4}\fi + \ifx\jlreq@after@space\@empty\else\edef\jlreq@after@space{r:\expandonce{\jlreq@after@space}}\fi + \ifx\jlreq@after@lines\@empty\else\edef\jlreq@after@space{a:\expandonce{\jlreq@after@lines}\baselineskip}\fi + \ifx\jlreq@after@space\@empty\def\jlreq@after@space{#5}\fi + \edef\jlreq@do{% + \unexpanded{\def\jlreq@result}{{\expandonce{\jlreq@before@space}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@lines}}}% + }% + \expandafter\endgroup + \jlreq@do +} + +% \DeclareBlockHeading{命令名}{レベル}{設定} +\def\jlreq@BlockHeading@allheadings{}% 別行見出し一覧 +\newcommand{\DeclareBlockHeading}[3]{% + \def\jlreq@do{\@removeelement{#1}}% + \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% + \appto\jlreq@heading@allheadings{,#1}% + \expandafter\jlreq@do\expandafter{\jlreq@BlockHeading@allheadings}{\jlreq@BlockHeading@allheadings}% + \appto\jlreq@BlockHeading@allheadings{,#1}% + \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% + \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% + \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewBlockHeading}% + \@ifundefined{c@#1}{\newcounter{#1}}{}% + \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% + \jlreq@heading@make@maketoc{#1}{#2}% + \begingroup + \def\jlreq@font{}% + \def\jlreq@subtitle@font{}% + \def\jlreq@indent{0\zw}% + \def\jlreq@end@indent{0\zw}% + \def\jlreq@align{l}% + \edef\jlreq@format{\unexpanded{##1##2##3}}% + \edef\jlreq@heading@text@format{\unexpanded{##1}}% + \def\jlreq@pagebreak{}% + \def\jlreq@label@format{\@seccntformat{#1}}% + \newif\ifjlreq@hang\jlreq@hangtrue + \def\jlreq@after@label@space{1\zw}% + \def\jlreq@second@heading@text@indent@wlabel{0pt}% + \def\jlreq@second@heading@text@indent@wolabel{0pt}% + \edef\jlreq@subtitle@format{\unexpanded{---##1---}}% + \def\jlreq@subtitle@indent{1\zw}% + \def\jlreq@afterindent{\@afterindenttrue}% + \def\jlreq@allowbreak@evenpage{*}% 偶数ページでも改ページを許可するならば空，そうでないなら* + \newif\ifjlreq@subtitle@break\jlreq@subtitle@breaktrue + \def\jlreq@subtitle@indent{1\zw}% + \def\jlreq@column@spanning{false}% + \newif\ifjlreq@column@spanning@possible\jlreq@column@spanning@possiblefalse + % a,bみたいなのをaとbにわける．カンマがなければbは空．引数を{a}{b}として##2を呼び出す． + \def\jlreq@parsecomma##1##2{% + \jlreq@helper@dividebycomma{##1}% + \ifjlreq@result\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% + \edef\jlreq@do{\noexpand\jlreq@tempa{\expandonce{\jlreq@resulta}}{\expandonce{\jlreq@resultb}}}% + }{% + \edef\jlreq@do{\noexpand\jlreq@tempa{##1}{}}% + }% + \def\jlreq@tempa####1####2{##2}% + \jlreq@do + }% + \jlreq@parsekeyval[BlockHeading:#1]{ + {lines}{} + {before_space}{} + {after_space}{} + {before_lines}{} + {after_lines}{} + {font}{\def\jlreq@font{##1}} + {subtitle_font}{\def\jlreq@subtitle@font{##1}} + {indent}{\def\jlreq@indent{##1}} + {end_indent}{\def\jlreq@end@indent{##1}} + {align}[left,center,right]{% + \jlreq@switch{##1}{ + {left}{\def\jlreq@align{l}} + {center}{\def\jlreq@align{c}} + {right}{\def\jlreq@align{r}} + }% + } + {format}{\edef\jlreq@format{\unexpanded{##1}}} + {after_label_space}{\def\jlreq@after@label@space{##1}} + {second_heading_text_indent,heading_text_second_indent}{% + \jlreq@parsecomma{##1}{% + \jlreq@iffirsttoken{####1}{*}{% + \jlreq@hangfalse + \edef\jlreq@second@heading@text@indent@wlabel{\expandonce{\@gobble ####1}}% + }{% + \jlreq@hangtrue + \def\jlreq@second@heading@text@indent@wlabel{####1}% + }% + \jlreq@ifempty{####2}{% + \let\jlreq@second@heading@text@indent@wolabel=\jlreq@second@heading@text@indent@wlabel + }{% + \def\jlreq@second@heading@text@indent@wolabel{####2}% + }% + }% + } + {label_format}{\edef\jlreq@label@format{\unexpanded{##1}}} + {subtitle_format}{\edef\jlreq@subtitle@format{\unexpanded{##1}}} + {subtitle_indent}{\def\jlreq@subtitle@indent{##1}} + {subtitle_break}[true,false]{\csname jlreq@subtitle@break##1\endcsname} + {afterindent}[true,false]{\edef\jlreq@afterindent{\expandonce{\csname @afterindent##1\endcsname}}} + {allowbreak_if_evenpage}[true,false]{% + \jlreq@switch{##1}{ + {true}{\def\jlreq@allowbreak@evenpage{}} + {false}{\def\jlreq@allowbreak@evenpage{*}} + }% + } + {pagebreak}[clearpage,cleardoublepage,clearcolumn,nariyuki,begin_with_odd_page,begin_with_even_page]{% + \jlreq@switch{##1}{ + {clearpage}{\def\jlreq@pagebreak{\clearpage}\jlreq@column@spanning@possibletrue} + {cleardoublepage}{\def\jlreq@pagebreak{\cleardoublepage}\jlreq@column@spanning@possibletrue} + {clearcolumn}{\if@twocolumn\def\jlreq@pagebreak{\newpage}\else\def\jlreq@pagebreak{}\fi\jlreq@column@spanning@possiblefalse} + {begin_with_even_page}{\def\jlreq@pagebreak{\cleartoevenpage}\jlreq@column@spanning@possibletrue} + {begin_with_odd_page}{\def\jlreq@pagebreak{\cleartooddpage}\jlreq@column@spanning@possibletrue} + {nariyuki}{\def\jlreq@pagebreak{}\jlreq@column@spanning@possiblefalse} + }% + } + % 後々数字を受け付けるようになったりするかもしれないので…… + {column_spanning}{% + \jlreq@tempatrue % validな入力に対してfalse + \jlreq@ifempty{##1}{}{% + \jlreq@ifnumber{##1}{% 数字の時はtrueに回す + \jlreq@tempafalse + \def\jlreq@column@spanning{true}% + }{% + \jlreq@switch{##1}{% + {true}{\jlreq@tempafalse\def\jlreq@column@spanning{true}} + {false}{\jlreq@tempafalse\def\jlreq@column@spanning{false}} + }% + }% + }% + \ifjlreq@tempa\ClassWarningNoLine{jlreq}{Invalid input `##1' for column_spanning in BlockHeading #1}\fi + } + }{#3}% + \def\jlreq@do{}% 初期化．これに最終処理を入れていく． + % 入力チェック + \ifthenelse{\equal{\jlreq@column@spanning}{true}}{% + \ifjlreq@column@spanning@possible\else + \ClassWarningNoLine{jlreq}{column_spanning can be used only with `pagebreak=nariyuki' or `pagebreak=clearcolumn' (in BlockHeading #1)}% + \def\jlreq@column@spanning{false}% + \fi + }{}% + \edef\jlreq@format{\expandonce{\jlreq@font}\expandonce{\jlreq@format}}% + % 空き量などの調整を含んだラベル + \edef\jlreq@label@format@modified{% + \noexpand\noindent + \unexpanded{\setbox\jlreq@tempboxa=\hbox}{\expandonce{\jlreq@label@format}}% + \unexpanded{\hangindent=\glueexpr}(\expandonce{\jlreq@after@label@space}) + (\expandonce{\jlreq@second@heading@text@indent@wlabel})% + \ifjlreq@hang + +\wd\jlreq@tempboxa\relax + \else + \relax + \unexpanded{\edef\jlreq@BlockHeading@start@labellength{\the\wd\jlreq@tempboxa}}% + \fi + \box\jlreq@tempboxa + }% + \edef\jlreq@heading@text@format@wlabel{% + \ifdim\dimexpr\jlreq@after@label@space\relax=0pt\else + \noexpand\hspace*{\noexpand\dimexpr\expandonce{\jlreq@after@label@space}\noexpand\relax}% + \fi + \expandonce{\jlreq@heading@text@format}% + }% + \edef\jlreq@heading@text@format@wolabel{% + \ifdim\dimexpr\jlreq@second@heading@text@indent@wolabel\relax=0pt\else + \noexpand\hangindent=\noexpand\dimexpr\expandonce{\jlreq@second@heading@text@indent@wolabel}\noexpand\relax + \fi + \expandonce{\jlreq@heading@text@format}% + }% + \def\jlreq@make@subtitle@format##1##2{% + \edef##1{% + \ifjlreq@subtitle@break\unexpanded{{\par}\hangafter=0}\fi + \unexpanded{\hangindent=\dimexpr\hangindent + }(\expandonce{\jlreq@subtitle@indent}) ##2\noexpand\relax + \ifdim\jlreq@subtitle@indent=0pt\else + \ifjlreq@subtitle@break\else\unexpanded{\hspace*}{\expandonce{\jlreq@subtitle@indent}}\fi + \fi + \unexpanded{\nobreak\noindent}% + {\ifx\jlreq@subtitle@font\@empty\else\expandonce{\jlreq@subtitle@font}\fi\expandonce{\jlreq@subtitle@format}}% + }% + }% + \jlreq@make@subtitle@format\jlreq@subtitle@format@wlabel{% + - (\expandonce{\jlreq@second@heading@text@indent@wlabel})% + \ifjlreq@hang\else + (\noexpand\jlreq@BlockHeading@start@labellength)\fi + }% + \jlreq@make@subtitle@format\jlreq@subtitle@format@wolabel{- (\expandonce{\jlreq@second@heading@text@indent@wolabel})}% + \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% + \eappto\jlreq@do{\expandonce{\jlreq@result}}% + \jlreq@BlockHeading@gyodori@parsekeyval*[BlockHeading:#1]{#3}{}{}{1}% + \let\jlreq@spaceset=\jlreq@result + \edef\jlreq@totalformat{\unexpanded{##1}\expandonce{\jlreq@afterindent}\noexpand\@afterheading}% + \if@twocolumn + \ifthenelse{\equal{\jlreq@column@spanning}{true}}{% + \def\@tempa##1##2##3{% + % 前開きが常に入ってしまうので，a:の時は除去する + \jlreq@iffirsttoken{##1}{a}{\def\jlreq@spaceset{{}{##2}{##3}}}{} + \edef\jlreq@totalformat{% + \noexpand\twocolumn[% + % 普段自動で入る\topskipと\baselineskipを手動で入れる + \jlreq@iffirsttoken{##1}{r}{}{\unexpanded{\vskip\topskip\relax}}% + \unexpanded{####1}% + \jlreq@iffirsttoken{##2}{r}{}{\unexpanded{\vskip\glueexpr\baselineskip - \topskip\relax}}% + ]% + }% + }% + \expandafter\@tempa\jlreq@spaceset + }{}% + \fi + \edef\jlreq@do{% + \expandonce{\jlreq@do}% + \noexpand\edef\expandonce{\csname jlreq@headingcs@#1\endcsname}{\noexpand\unexpanded{% + \noexpand\jlreq@hook@beforeheadings{#1}% + \expandonce{\jlreq@pagebreak}% + \unexpanded{\jlreq@BlockHeading@start{#1}{#2}}% + {{\expandonce{\jlreq@align}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@end@indent}}\expandonce{\jlreq@spaceset}{\expandonce{\jlreq@allowbreak@evenpage}}}% + {% + {\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@label@format@modified}}% + {\expandonce{\jlreq@heading@text@format@wlabel}}{\expandonce{\jlreq@heading@text@format@wolabel}}% + {\expandonce{\jlreq@subtitle@format@wlabel}}{\expandonce{\jlreq@subtitle@format@wolabel}}% + {\expandonce{\jlreq@format}}% + }% + {\expandonce{\jlreq@totalformat}}% + }}% + \noexpand\def\expandonce{\csname #1\endcsname}{\expandonce{\csname jlreq@headingcs@#1\endcsname}}% + }% + \expandafter\endgroup + \jlreq@do +} + +\newcommand{\NewBlockHeading}[3]{% + \expandafter\@ifdefinable\csname #1\endcsname{\DeclareBlockHeading{#1}{#2}{#3}}% +} +\newcommand{\RenewBlockHeading}[3]{% + \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareBlockHeading{#1}{#2}{#3}}% +} +\newcommand{\ProvideBlockHeading}[3]{% + \@ifundefined{#1}{\DeclareBlockHeading{#1}{#2}{#3}}{}% +} + +%.. 別行見出しが連続した場合の処理 +% 設定値保存に次のマクロを使う +% \jlreq@BlockHeading@spaces@headingslist +% : スペースを考慮しないとならない見出しのリスト．,_chapter_section_subsection,_section_subsection,...みたいな感じ +% \jlreq@BlockHeading@spaces@setlist@<見出し名リスト> +% : 見出し名リストが続いたときの空き関連設定．<見出し名リスト>は_chapter_section_subsectionみたいなやつ． +% {***}{***}...というリスト．各々の***は次のどれか． +% 最初：全体への指定．{前空き}{後ろ空き}{行数} +% _{前空き}{後ろ空き}{行数}：見出しに対する指定．先頭が_*の場合は，デフォルト設定をロードしてからということ． +% それ以外：空き量 +% 最初や最後に空き量指定がある場合は，全体への指定に組み込むことにする． +% +% 現在状況保存に以下のマクロを使う +% \jlreq@BlockHeading@spaces@current@sequence +% : 現在どのような見出しが続いているかリスト． +% \jlreq@BlockHeading@spaces@current@space@ +% : 現在処理中のn番目の見出しに対する空き情報．{前空き}{後ろ空き}{トータル行数}{偶数ページbreak情報}．n=1から始まる． +% \jlreq@BlockHeading@spaces@current@output@ +% : 現在処理中のn番目の見出しの中身． +% \jlreq@BlockHeading@spaces@current@format@ +% : 現在処理中のn番目の見出しのフォーマット．行取りマクロを包み込むようにする． +% \jlreq@BlockHeading@spaces@current@before@ +% : n番目の見出しの前に出すもの +% \jlreq@BlockHeading@spaces@current@after@ +% : n番目の見出しの後ろに出すもの +% \jlreq@BlockHeading@spaces@current@count +% : 現在いくつ目の連続する見出しを処理しているかのカウンター +\newcount\jlreq@BlockHeading@spaces@current@count +\jlreq@BlockHeading@spaces@current@count=0 +\def\jlreq@BlockHeading@spaces@current@sequence{} +\def\jlreq@BlockHeading@spaces@headingslist{} + +\newcommand{\SetBlockHeadingSpaces}[1]{% + \begingroup + % 現段階の情報をクリアする + \def\jlreq@tempa{}% 見出しリスト + \def\jlreq@tempb{}% 設定リスト \def\jlreq@BlockHeading@spaces@***{{**}{**}...}ってのを入れる + \jlreq@SetBlockHeadingSpaces#1\jlreq@endmark + \edef\jlreq@do{% + \unexpanded{% + \@for\@tempa:=\jlreq@BlockHeading@spaces@headingslist\do{% + \expandafter\let\csname jlreq@BlockHeading@spaces@setlist@\@tempa\endcsname=\@undefined + }% + }% + \unexpanded{\def\jlreq@BlockHeading@spaces@headingslist}{\expandonce{\jlreq@tempa}}% + \expandonce{\jlreq@tempb}% + }% + \expandafter\endgroup + \jlreq@do +} +\def\jlreq@SetBlockHeadingSpaces{% カンマを無視する処理 + \@ifnextchar,{\expandafter\jlreq@SetBlockHeadingSpaces@i\@gobble}{\jlreq@SetBlockHeadingSpaces@i}% +} +\def\jlreq@SetBlockHeadingSpaces@i{% + \@ifnextchar[{\jlreq@SetBlockHeadingSpaces@ii}{\jlreq@SetBlockHeadingSpaces@ii[]}% +} +\def\jlreq@SetBlockHeadingSpaces@ii[#1]#2{% + \jlreq@ifendmark{#2}{}{% + \def\jlreq@headings{}% 見出し名リスト + \jlreq@BlockHeading@gyodori@parsekeyval[BlockHeadingSpaces]{#1}{}{}{}% + \let\jlreq@totalset=\jlreq@result% 上の#1に対応する設定 + \def\jlreq@set{}% 個々の設定 + \def\jlreq@lastdimen{}% 最後の寸法 + \def\jlreq@do##1##2##3{% + \jlreq@ifempty{##1}{\jlreq@tempatrue}{\jlreq@tempafalse}% 前開きが空ならば\jlreq@tempatrue + \jlreq@ifempty{##2}{\jlreq@tempbtrue}{\jlreq@tempbfalse}% 後ろ開きが空ならば\jlreq@tempbtrue + }% + \expandafter\jlreq@do\jlreq@totalset + \jlreq@SetBlockHeadingSpaces@iii{#2}% + \eappto\jlreq@tempa{,\expandonce{\jlreq@headings}}% \jlreq@tempaに\jlreq@headingsを追加 + \ifjlreq@tempb + \ifx\jlreq@lastdimen\@empty\else % 最後が寸法だったので\jlreq@SetBlockHeadingSpaces@totalsetを改変 + \def\jlreq@do##1##2##3{% + \edef\jlreq@totalset{{\unexpanded{##1}}{r:\expandonce{\jlreq@lastdimen}}{\unexpanded{##3}}}% + }% + \expandafter\jlreq@do\jlreq@totalset + \fi + \else + \eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}% + \fi + \eappto\jlreq@tempb{% + \noexpand\@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@headings}{}{% + \noexpand\ClassError{jlrqe}{The spaces for \jlreq@headings\space is defined more than once (in SetBlockHeadingSpaces)}{\noexpand\@ehc}% + }% + \noexpand\def\expandonce{\csname jlreq@BlockHeading@spaces@setlist@\jlreq@headings\endcsname}{{\expandonce{\jlreq@totalset}}\expandonce{\jlreq@set}}% + }% + \jlreq@SetBlockHeadingSpaces + }% +} +\def\jlreq@SetBlockHeadingSpaces@iii#1{% + \@for\@tempa:=#1\do{% + \expandafter\jlreq@remove@spaceandbracket\expandafter{\@tempa}{\@tempa}% + \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\@tempa}{_}{% + \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi% + \def\jlreq@lastdimen{}% + \expandafter\jlreq@SetBlockHeadingSpaces@iv\@tempa{\jlreq@endmark}% + }{% + \ifjlreq@tempa + % 最初が寸法なので，全体の設定（\jlreq@totalset）に組み込む． + \def\jlreq@do##1##2##3{% + \edef\jlreq@totalset{{r:\expandonce{\@tempa}}{\unexpanded{##2}}{\unexpanded{##3}}}% + }% + \expandafter\jlreq@do\jlreq@totalset + \else + \ifx\jlreq@lastdimen\@empty\else\eappto\jlreq@set{{\expandonce{\jlreq@lastdimen}}}\fi + \let\jlreq@lastdimen=\@tempa + \fi + }% + \jlreq@tempafalse + }% +} +\def\jlreq@SetBlockHeadingSpaces@iv#1#{% + \expandafter\jlreq@ifcontains\expandafter{\@gobble #1}{_}{% + \ClassWarning{jlreq}{Unusual heading name `\@gobble #1' is found. You forgot a comma? (in SetBlockHeadingSpaces)}% + }{}% + \jlreq@ifendswith{#1}{*}{{% + \def\@tempa_##1*{\def\@tempa{##1}}% + \@tempa#1% + \ClassWarning{jlreq}{The heading name `\@gobble #1' ends with `*'. Do you mean `\@tempa{*}'? (in SetBlockHeadingSpaces)}% + }}{}% + \appto\jlreq@headings{#1}% + \jlreq@SetBlockHeadingSpaces@v +} +\def\jlreq@SetBlockHeadingSpaces@v#1{% + % 空っぽの場合は{_{r:0pt}{r:0pt}{}} + \jlreq@ifendmark{#1}{\appto\jlreq@set{{_{r:0pt}{r:0pt}{}}}}{% + \jlreq@iffirsttoken{#1}{*}{% *始まりの場合は{_*{}{}{}} + \expandafter\jlreq@BlockHeading@gyodori@parsekeyval\expandafter{\@gobble #1}{}{}{}% + \eappto\jlreq@set{{_*\expandonce{\jlreq@result}}}% + }{% それ以外の場合は{_{}{}{}} + \jlreq@BlockHeading@gyodori@parsekeyval{#1}{}{}{}% + \eappto\jlreq@set{{_\expandonce{\jlreq@result}}}% + }% + \@gobble % \jlreq@endmarkを食う + }% +} + +% 現在の情報に基づき出力 +\def\jlreq@BlockHeading@spaces@output{% + \@ifundefined{jlreq@BlockHeading@spaces@setlist@\jlreq@BlockHeading@spaces@current@sequence}{% + \jlreq@BlockHeading@spaces@outputwospace + }{% + \expandafter\expandafter\expandafter\jlreq@BlockHeading@spaces@output@\csname jlreq@BlockHeading@spaces@setlist@\jlreq@BlockHeading@spaces@current@sequence\endcsname\jlreq@endmark + }% +} + +% 連続スペース情報とか無視して各々の見出しを出力する +\def\jlreq@BlockHeading@spaces@outputwospace{% + \begingroup + \jlreq@tempcnta=0 + \def\jlreq@do{}% + \jlreq@BlockHeading@spaces@outputwospace@ + \jlreq@BlockHeading@spaces@clear + \expandafter\endgroup + \jlreq@do +} +\def\jlreq@BlockHeading@spaces@outputwospace@{% + \ifnum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count + \advance\jlreq@tempcnta by 1 + \eappto\jlreq@do{\csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}}% + \edef\jlreq@tempa{% + \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}% + }% + \jlreq@tempa + \edef\jlreq@tempb{% + \noexpand\expandonce{\noexpand\jlreq@tempa{% + \noexpand\jlreq@BlockHeading@start@gyodori + \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}% + {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}% + }}% + }% + \eappto\jlreq@do{\jlreq@tempb\csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}}% + \expandafter\jlreq@BlockHeading@spaces@outputwospace@ + \fi +} + +\def\jlreq@BlockHeading@spaces@output@#1#2\jlreq@endmark{% + \def\jlreq@result{}% + \jlreq@tempcnta=0 + \jlreq@BlockHeading@spaces@output@@#2\jlreq@endmark + \jlreq@tempatrue % 周りの行取り処理が必要か + \jlreq@ifempty{#1}{\jlreq@tempafalse}{}% + \ifthenelse{\equal{#1}{{}{}{}}}{\jlreq@tempafalse}{}% + \edef\jlreq@do{% + \ifjlreq@tempa + \unexpanded{\jlreq@BlockHeading@start@gyodori#1}{*}{% + \expandonce{\jlreq@result}% + }% + \else + \expandonce{\jlreq@result}% + \fi + }% + \jlreq@BlockHeading@spaces@clear + \jlreq@do +} +% jlreq@resultに出力すべきものを入れていく +\def\jlreq@BlockHeading@spaces@output@@#1{% + \jlreq@ifendmark{#1}{}{% + \jlreq@iffirsttoken@ignorespaces{#1}{_}{% + \advance\jlreq@tempcnta by 1 + \expandafter\jlreq@BlockHeading@spaces@output@@@\expandafter{\@gobble #1}% + }{% + \appto\jlreq@result{\vskip\glueexpr #1\relax}% + }% + \jlreq@BlockHeading@spaces@output@@ + }% +} +\def\jlreq@BlockHeading@spaces@output@@@#1{% + \edef\jlreq@do{% + \noexpand\jlreq@BlockHeading@spaces@output@@@@ + \jlreq@iffirsttoken@ignorespaces{#1}{*}{{*}\expandonce{\@gobble #1}}{\unexpanded{{}#1}}% + \csexpandonce{jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta}% + {\csexpandonce{jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta}}% + }% + \jlreq@do +} +% #1: デフォルト値を使うならば*，#2#3#4が設定された値，#5#6#7がデフォルト値，#8は偶数ページの，#9が出力 +\def\jlreq@BlockHeading@spaces@output@@@@#1#2#3#4#5#6#7#8#9{% + \edef\jlreq@tempa{% + \unexpanded{\long\def\jlreq@tempa##1}{\csexpandonce{jlreq@BlockHeading@spaces@current@format@\the\jlreq@tempcnta}}% + }% + \jlreq@tempa + \edef\jlreq@tempb{% + \noexpand\expandonce{\noexpand\jlreq@tempa{% + \noexpand\jlreq@BlockHeading@start@gyodori + \jlreq@ifempty{#1}{\unexpanded{{#2}{#3}{#4}}}{% + {\jlreq@ifempty{#2}{\unexpanded{#5}}{\unexpanded{#2}}}% + {\jlreq@ifempty{#3}{\unexpanded{#6}}{\unexpanded{#3}}}% + {\jlreq@ifempty{#4}{\unexpanded{#7}}{\unexpanded{#4}}}% + }\unexpanded{{#8}{#9}}% + }}% + }% + \eappto\jlreq@result{% + \csexpandonce{jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta}% + \jlreq@tempb + \csexpandonce{jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta}% + }% +} + +% 連続見出しスペース調整用のデータをすべてクリアする +\def\jlreq@BlockHeading@spaces@clear{% + \begingroup + \jlreq@tempcnta=0 + \@whilenum\jlreq@tempcnta<\jlreq@BlockHeading@spaces@current@count\do{% + \advance\jlreq@tempcnta by 1 + \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@space@\the\jlreq@tempcnta\endcsname=\@undefined + \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@output@\the\jlreq@tempcnta\endcsname=\@undefined + \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@before@\the\jlreq@tempcnta\endcsname=\@undefined + \expandafter\global\expandafter\let\csname jlreq@BlockHeading@spaces@current@after@\the\jlreq@tempcnta\endcsname=\@undefined + }% + \gdef\jlreq@BlockHeading@spaces@current@sequence{}% + \global\jlreq@BlockHeading@spaces@current@count=0 + \endgroup +} + +%.. 同行見出し +% {1 = 命令名}{2 = レベル}{3 = ラベルフォーマット}{4 = ラベルありフォーマット}{5 = ラベルなしフォーマット} +% 4,5は見出し文字列が#1になる． +\long\def\jlreq@RuninHeading@start#1#2#3#4#5{% + \edef\jlreq@RuninHeading@start@format@label{\unexpanded{#3}}% + \edef\jlreq@RuninHeading@start@format@wlabel{\unexpanded{#4}}% + \edef\jlreq@RuninHeading@start@format@wolabel{\unexpanded{#5}}% + \@ifstar{\@dblarg{\jlreq@RuninHeading@start@{#1}{#2}{*}}}{\@dblarg{\jlreq@RuninHeading@start@{#1}{#2}{}}}% +} +% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し} +\long\def\jlreq@RuninHeading@start@#1#2#3[#4]#5{% + \edef\jlreq@do{\unexpanded{\jlreq@RuninHeading@start@@{#1}{#2}{#3}{#4}{#5}}{\expandonce{\jlreq@RuninHeading@start@format@label}}{\expandonce{\jlreq@RuninHeading@start@format@wlabel}}{\expandonce{\jlreq@RuninHeading@start@format@wolabel}}}% + \jlreq@do +} +% {1 = 命令名}{2 = レベル}{3 = *}{4 = running head}{5 = 見出し}{6 = ラベルフォーマット}{7 = ラベルありフォーマット}{8 = ラベルなしフォーマット} +\long\def\jlreq@RuninHeading@start@@#1#2#3#4#5#6#7#8{% + \if@noskipsec\leavevmode\fi + \begingroup + \def\jlreq@do{\global\@noskipsectrue}% + \ifnum0\jlreq@ifempty{#3}{}{1}\ifnum #2>\c@secnumdepth 1\fi>0 + \def\jlreq@tempa##1{#8}% + \else + \appto\jlreq@do{\refstepcounter{#1}}% + \def\jlreq@tempa##1{#7}% + \fi + \par + \eappto\jlreq@do{% + \noexpand\everypar{% + \noexpand\if@noskipsec + \unexpanded{\global\@noskipsecfalse}% + \unexpanded{{\setbox\jlreq@tempboxa\lastbox}}% + \noexpand\begingroup + \expandonce{\jlreq@tempa{#5}}% + \expandonce{\csname jlreq@heading@maketoc@#1\endcsname}{#3}{#6}{#4}% + \noexpand\endgroup + \noexpand\else + \unexpanded{\everypar{}}% + \noexpand\fi + }% + }% + \expandafter\endgroup + \jlreq@do + \ignorespaces +} + +% \DeclareRuninHeading{命令名}{レベル}{設定} +\newcommand*{\DeclareRuninHeading}[3]{% + \def\jlreq@do{\@removeelement{#1}}% + \expandafter\jlreq@do\expandafter{\jlreq@heading@allheadings}{\jlreq@heading@allheadings}% + \appto\jlreq@heading@allheadings{,#1}% + \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% + \expandafter\edef\csname jlreq@heading@setting@#1\endcsname{\unexpanded{#3}}% + \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewRuninHeading}% + \@ifundefined{c@#1}{\newcounter{#1}}{}% + \@ifundefined{#1mark}{\expandafter\let\csname #1mark\endcsname\@gobble}{}% + \@ifundefined{l@#1}{\expandafter\def\csname l@#1\endcsname{\@dottedtocline{#2}{0\zw}{2\zw}}}{}% + \jlreq@heading@make@maketoc{#1}{#2}% + \begingroup + \def\jlreq@font{\normalfont\normalsize}% + \def\jlreq@indent{0\zw}% + \def\jlreq@after@label@space{1\zw}% + \def\jlreq@mark{}% + \def\jlreq@label@font{}% + \def\jlreq@label@format{\@seccntformat{#1}}% + \def\jlreq@after@space{1\zw}% + \jlreq@parsekeyval[RuninHeading:#1]{% + {font}{\def\jlreq@font{##1}} + {indent}{\def\jlreq@indent{##1}} + {mark}{\def\jlreq@mark{##1}} + {label_format}{\def\jlreq@label@format{##1}} + {after_label_space}{ + \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_label_space in Runin Heading #1 should be not negative}\fi + \def\jlreq@after@label@space{##1} + } + {after_space}{% + \ifdim\dimexpr##1\relax<0pt \ClassWarning{jlreq}{after_space in Runin Heading #1 should be not negative}\fi + \def\jlreq@after@space{##1}% + } + }{#3}% + \newif\ifjlreq@indent@zero + \jlreq@ifgluezero{\glueexpr\jlreq@indent\relax}{\jlreq@indent@zerotrue}{\jlreq@indent@zerofalse}% + \newif\ifjlreq@after@space@zero + \jlreq@ifgluezero{\glueexpr\jlreq@after@space\relax}{\jlreq@after@space@zerotrue}{\jlreq@after@space@zerofalse}% + \newif\ifjlreq@after@label@space@zero + \jlreq@ifgluezero{\glueexpr\jlreq@after@label@space\relax}{\jlreq@after@label@spacefalse}% + \edef\jlreq@format@wlabel{{% + \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi + \expandonce{\jlreq@font}% + \expandonce{\jlreq@label@format}% + \ifjlreq@after@label@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@label@space}\noexpand\relax\fi + ####1% + \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi + }}% + \edef\jlreq@format@wolabel{{% + \ifjlreq@indent@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@indent}\noexpand\relax\fi + \expandonce{\jlreq@font}% + ####1% + \ifjlreq@after@space@zero\else\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@after@space}\noexpand\relax\fi + }}% + \jlreq@heading@make@l@{#1}{#2}{\jlreq@label@format}% + \edef\jlreq@do{% + \expandonce{\jlreq@result}% + % パラメータトークンを含むので，\edefして\unexpandedで包む + \noexpand\edef\expandonce{\csname #1\endcsname}{% + \noexpand\unexpanded{% + \unexpanded{\jlreq@hook@beforeheadings{#1}}% + \unexpanded{\jlreq@RuninHeading@start{#1}{#2}}{\expandonce{\jlreq@label@format}}{\expandonce{\jlreq@format@wlabel}}{\expandonce{\jlreq@format@wolabel}}% + }% + }% + }% + \expandafter\endgroup + \jlreq@do +} +\newcommand*{\NewRuninHeading}[3]{% + \expandafter\@ifdefinable\csname #1\endcsname{\DeclareRuninHeading{#1}{#2}{#3}}% +} +\newcommand*{\RenewRuninHeading}[3]{% + \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareRuninHeading{#1}{#2}{#3}}% +} +\newcommand*{\ProvideRuninHeading}[3]{% + \@ifundefined{#1}{\DeclareRuninHeading{#1}{#2}{#3}}{}% +} + +%.. 窓見出し +\def\jlreq@CutinHeading@start#1#2#3#4#5#6#7{% + \par + \ifnum\hangafter=1 + \jlreq@CutinHeading@start@{#2}{#3}{#4}{#5}{#6}{#7}% + \else + \ClassError{jlreq}{Can not use \expandafter\string\csname#1\endcsname\space here}{\@ehc}% + \fi +} +% 1 = 書式指定，2 = インデント, 3 = 見出しと本文の間, 4 = これを越えたら二行以上，5 = これを越えたら三行以上，6 = テキスト +\def\jlreq@CutinHeading@start@#1#2#3#4#5#6{% + % 一行で処理したときの見出し長さを計測 + \begingroup + \setbox\@tempboxa=\hbox{#1#6}% + \@tempdima=\wd\@tempboxa + % 何行必要かを\jlreq@CutinHeading@linecountに入れる + \ifdim\@tempdima>#5\def\jlreq@CutinHeading@linecount{3}% + \else\ifdim\@tempdima>#4\def\jlreq@CutinHeading@linecount{2}% + \else\def\jlreq@CutinHeading@linecount{1}\fi\fi + % \@tempdimaが実際の一行の長さに近い + \divide\@tempdima by \jlreq@CutinHeading@linecount + % \jlreq@resultboxに見出し部分を，\jlreq@CutinHeading@linecountに見出し自身に何行使うかを入れる + \ifnum\jlreq@CutinHeading@linecount=1\relax + \setbox\jlreq@resultbox=\vbox{\parindent=0pt\rightskip=0pt\leftskip=0pt\hbox{#1#6}}% + \def\jlreq@CutinHeading@linecount{2}% + \else + \jlreq@inlinenote@determinelength{#6}{#1}{}{\jlreq@CutinHeading@linecount}{\jlreq@CutinHeading@linecount}{\@tempdima}{\linewidth}% + \def\jlreq@CutinHeading@linecount{3}% + \fi + % 普通の一行の高さ/深さに合わせて見出しのボックスを作る + \setbox\@tempboxa=\vtop to \dimexpr\numexpr\jlreq@CutinHeading@linecount - 1\relax\baselineskip + 1\zh\relax{\vskip 0pt plus 1fill minus 1fill \box\jlreq@resultbox\vskip 0pt plus 1fill minus 1fill}% + % 高さを通常の一行のそれにする + \setbox\jlreq@tempboxa=\hbox{阿}% + \dp\@tempboxa=\dimexpr\ht\@tempboxa + \dp\@tempboxa - \ht\jlreq@tempboxa\relax + \ht\@tempboxa=\ht\jlreq@tempboxa + \noindent + \hspace*{#2}% + \copy\@tempboxa + \hspace*{#3}% + \par + % でかい見出しボックスの分をキャンセルする空きを入れる + % \baselineskip - \ht\jlreq@tempboxaはTeXが挿入するスキップの分 + \vskip -\dimexpr\ht\@tempboxa + \dp\@tempboxa + \baselineskip - \ht\jlreq@tempboxa\relax\relax + \edef\jlreq@do{% + \noexpand\hangindent=\the\dimexpr#2 + \wd\@tempboxa + #3\relax\relax + \noexpand\hangafter=-\jlreq@CutinHeading@linecount\relax + }% + \expandafter\endgroup + \jlreq@do + \prevdepth=0pt + % 改段落が起こっても\hang****をキープするように\parを書き換えておく（終わったら元に戻す）． + \def\par{% + \ifvmode\jlreq@tempatrue\else\jlreq@tempafalse\fi + \jlreq@tempcnta=\hangafter\relax + \jlreq@tempdima=\hangindent\relax + \@@par + \ifjlreq@tempa\else\advance\jlreq@tempcnta by \prevgraf\relax\fi + \ifnum\jlreq@tempcnta<0 + \hangafter=\jlreq@tempcnta\relax + \hangindent=\jlreq@tempdima\relax + \else + \@restorepar + \fi + }% + \@afterindentfalse + \@afterheading + \ignorespaces +} + +\newcommand*{\DeclareCutinHeading}[3]{% + \expandafter\def\csname jlreq@heading@level@#1\endcsname{#2}% + \expandafter\def\csname jlreq@heading@setting@#1\endcsname{#3}% + \expandafter\def\csname jlreq@heading@type@#1\endcsname{\RenewCutinHeading}% + \begingroup + \def\jlreq@fontcommand{\sffamily\bfseries}% + \def\jlreq@onelinemax{6\zw}% + \def\jlreq@twolinemax{20\zw}% + \def\jlreq@indent{0\zw}% + \def\jlreq@after@space{1\zw}% + \jlreq@parsekeyval[CutinHeading:#1]{ + {font}{\def\jlreq@fontcommand{##1}} + {onelinemax}{\def\jlreq@onelinemax{##1}} + {twolinemax}{\def\jlreq@twolinemax{##1}} + {indent}{\def\jlreq@indent{##1}} + {after_space}{\def\jlreq@after@space{##1}} + }{#3}% + \ifthenelse{\lengthtest{\jlreq@after@space < 0.99\zw} \OR \lengthtest{\jlreq@after@space > 2.01\zw}}{% + \jlreq@note{窓見出しと本文との空き量は，基本版面の文字サイズの全角以上，2倍未満とする (4.1.10.c)．}% + }{}% + \edef\jlreq@do{% + \noexpand\def\expandonce{\csname #1\endcsname}{% + \noexpand\jlreq@CutinHeading@start{#1}{\expandonce{\jlreq@fontcommand}}{\expandonce{\jlreq@indent}}{\expandonce{\jlreq@after@space}}{\expandonce{\jlreq@onelinemax}}{\expandonce{\jlreq@twolinemax}}% + }% + }% + \expandafter\endgroup + \jlreq@do +} +\newcommand*{\NewCutinHeading}[3]{% + \expandafter\@ifdefinable\csname #1\endcsname{\DeclareCutinHeading{#1}{#2}{#3}}% +} +\newcommand*{\RenewCutinHeading}[3]{% + \@ifundefined{#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclareCutinHeading{#1}{#2}{#3}}% +} +\newcommand*{\ProvideCutinHeading}[3]{% + \@ifundefined{#1}{\DeclareCutinHeading{#1}{#2}{#3}}{}% +} + +\newcommand{\ModifyHeading}[2]{% + \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown heading: #1}{\@ehc}}% + \edef\jlreq@do{\csexpandonce{jlreq@heading@type@#1}{#1}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1},\unexpanded{#2}}}% + \jlreq@do +} +% 見出し#1をマクロ#2に保存する +\newcommand{\SaveHeading}[2]{% + \@ifundefined{jlreq@heading@setting@#1}{\ClassError{jlreq}{Unknown heading: #1}{\@ehc}}{}% + \edef#2{% + \csexpandonce{jlreq@heading@type@#1}{\unexpanded{#1}}{\csexpandonce{jlreq@heading@level@#1}}{\csexpandonce{jlreq@heading@setting@#1}}% + }% +} + +\newcommand*{\jlreq@keepbaselineskip}[1]{% + \begingroup + \edef\jlreq@do{\unexpanded{#1}\noexpand\baselineskip=\the\baselineskip}% + \expandafter\endgroup + \jlreq@do +} + +\newcommand*\jlreq@HeadingType[1]{% + \ifcsname jlreq@heading@type@#1\endcsname + \jlreq@HeadingType@{#1}{\RenewTobiraHeading}{TobiraHeading}{% + \jlreq@HeadingType@{#1}{\RenewBlockHeading}{BlockHeading}{% + \jlreq@HeadingType@{#1}{\RenewRuninHeading}{RuninHeading}{% + \jlreq@HeadingType@{#1}{\RenewCutinHeading}{CutinHeading}{% + UnknownHeading}}}}% + \else + UndefinedHeading% + \fi +} +\newcommand*\jlreq@HeadingType@[2]{% + \expandafter\expandafter\expandafter\ifx\csname jlreq@heading@type@#1\endcsname#2\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi +} + +% 全ての見出しにマクロ#1を適用する． +\def\jlreq@heading@execmacro@toallheadings#1{% + \begingroup + \def\jlreq@do{}% + \ifx\jlreq@heading@allheadings\@undefined + \jlreq@heading@execmacro@toallheadings@{#1}{chapter,part,section,subsection,subsubsection,paragraph,subparagraph}% + \else + \def\@tempa{\jlreq@heading@execmacro@toallheadings@{#1}}% + \expandafter\@tempa\expandafter{\jlreq@heading@allheadings}% + \fi + \expandafter\endgroup + \jlreq@do +} + +\def\jlreq@heading@execmacro@toallheadings@#1#2{ + \@for\jlreq@tempa:=#2\do{% + \@ifundefined{\jlreq@tempa}{}{% + \eappto\jlreq@do{\noexpand#1{\expandonce{\jlreq@tempa}}}% + }% + }% +} +\def\jlreq@clearheadingmarks#1{% + \@ifundefined{#1mark}{}{% + \expandafter\let\csname#1mark\endcsname=\@gobble + }% +} + +%.. 各種定義 +\setcounter{secnumdepth}{3} +\newcounter{part} +\jlreq@switch{\jlreq@article@type}{ + {article}{\newcounter{section}} + {\newcounter{chapter}\newcounter{section}[chapter]}% book, report +} +\newcounter{subsection}[section] +\newcounter{subsubsection}[subsection] +\newcounter{paragraph}[subsubsection] +\newcounter{subparagraph}[paragraph] +\renewcommand*{\@seccntformat}[1]{\csname the#1\endcsname} + +\if@tate + \renewcommand{\thepart}{\jlreq@Kanji{part}} + \ifthenelse{\equal{\jlreq@article@type}{article}}{}{\renewcommand{\thechapter}{\jlreq@Kanji{chapter}}} + \renewcommand{\thesection}{\jlreq@rensuji{\@arabic\c@section}} + \renewcommand{\thesubsection}{\jlreq@rensuji{\@alph\c@subsection}} + \renewcommand{\thesubsubsection}{\jlreq@rensuji{\@arabic\c@subsubsection}} + \renewcommand{\theparagraph}{(\jlreq@rensuji{\@arabic\c@paragraph})} + \renewcommand{\thesubparagraph}{(\jlreq@rensuji{\@arabic\c@subparagraph})} + + \ifthenelse{\equal{\jlreq@article@type}{article}}{ + \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE}},indent=4\zw,lines=4,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\large}}} + \if@twoside\ModifyHeading{part}{allowbreak_if_evenpage=true}\fi + } + {% book, report + \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\zw}},format={\null\vfill {\Huge\hspace*{2\zw}#1#2}\vspace*{2\jlreq@gol}}} + \NewBlockHeading{chapter}{0}{indent=2\zw,lines=6,label_format={第\thechapter 章},font={\huge},after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\Large}}} + \if@twoside\ModifyHeading{chapter}{allowbreak_if_evenpage=true}\fi + \renewcommand{\thechapter}{\jlreq@Kanji{chapter}} + } + \NewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\Large}},indent=6\zw,lines=3,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\normalsize}}} + \if@twoside\ModifyHeading{section}{allowbreak_if_evenpage=true}\fi + \NewBlockHeading{subsection}{2}{font={\jlreq@keepbaselineskip{\large}},indent=8\zw,lines=2,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\small}}} + \if@twoside\ModifyHeading{subsection}{allowbreak_if_evenpage=true}\fi + \NewBlockHeading{subsubsection}{3}{font={\jlreq@keepbaselineskip{\normalsize}},indent=10\zw,lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},,subtitle_font={\jlreq@keepbaselineskip{\scriptsize}}} + \if@twoside\ModifyHeading{subsubsection}{allowbreak_if_evenpage=true}\fi + \NewRuninHeading{paragraph}{4}{font={\jlreq@keepbaselineskip{\normalsize}}} + \NewRuninHeading{subparagraph}{5}{font={\jlreq@keepbaselineskip{\normalsize}},indent=1\zw} +\else% yoko + \renewcommand{\thepart}{\Roman{part}} + \renewcommand{\thesubsection}{\thesection .\arabic{subsection}} + \renewcommand{\thesubsubsection}{\thesubsection .\arabic{subsubsection}} + \renewcommand{\theparagraph}{\thesubsubsection .\arabic{paragraph}} + \renewcommand{\thesubparagraph}{\theparagraph .\arabic{subparagraph}} + \ifthenelse{\equal{\jlreq@article@type}{article}}{ + \NewBlockHeading{part}{0}{font={\jlreq@keepbaselineskip{\LARGE\sffamily\bfseries}},label_format={第\thepart 部},lines=4,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\large}}} + \renewcommand{\thesection}{\arabic{section}} + } + {% book, report + \NewTobiraHeading{part}{-1}{label_format={第\thepart 部\hspace*{1\jlreq@gol}},format={\null\vfil {\Huge\sffamily\bfseries #1#2}\vfil}} + \NewBlockHeading{chapter}{0}{% + font={\jlreq@keepbaselineskip{\huge\sffamily\bfseries}}, + label_format={第\thechapter 章}, + lines=5,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw}, + subtitle_font={\jlreq@keepbaselineskip{\Large}}} + \renewcommand{\thechapter}{\arabic{chapter}} + \renewcommand{\thesection}{\thechapter.\arabic{section}} + } + \NewBlockHeading{section}{1}{font={\jlreq@keepbaselineskip{\Large\sffamily\bfseries}},lines=3,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\normalsize}}} + \NewBlockHeading{subsection}{2}{font={\jlreq@keepbaselineskip{\large\sffamily\bfseries}},lines=2,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\small}}} + \NewBlockHeading{subsubsection}{3}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},lines=1,before_lines=1,subtitle_break=false,after_label_space=1\zw,second_heading_text_indent={-1\zw,1\zw},subtitle_font={\jlreq@keepbaselineskip{\scriptsize}}} + \NewRuninHeading{paragraph}{4}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},indent=1\zw} + \NewRuninHeading{subparagraph}{5}{font={\jlreq@keepbaselineskip{\normalsize\sffamily\bfseries}},indent=2\zw} +\fi + +\ifthenelse{\equal{\jlreq@article@type}{article}}{}{% book, report + \if@openright + \ModifyHeading{part}{type=naka} + \if@tate + \ModifyHeading{chapter}{pagebreak=begin_with_even_page} + \else + \ModifyHeading{chapter}{pagebreak=begin_with_odd_page} + \fi + \else + \ModifyHeading{part}{type=han} + \ModifyHeading{chapter}{pagebreak=clearpage} + \fi +} +\jlreq@switch{\jlreq@article@type}{ + {book}{% + \renewcommand{\jlreq@heading@maketoc@chapter}[3]{% + \jlreq@ifempty{#1}{% + \chaptermark{#3}% + \ifnum0\if@mainmatter\else1\fi\ifnum\jlreq@heading@level@chapter>\c@secnumdepth 1\fi>0 + \addcontentsline{toc}{chapter}{#3}% + \else + \addcontentsline{toc}{chapter}{\protect\numberline{#2}#3}% + \fi + }{}% + } + } + {report}{ + \renewcommand{\jlreq@heading@maketoc@chapter}[3]{% + \jlreq@ifempty{#1}{% + \chaptermark{#3}% + \ifnum0\ifnum\jlreq@heading@level@chapter>\c@secnumdepth 1\fi>0 + \addcontentsline{toc}{chapter}{#3}% + \else + \addcontentsline{toc}{chapter}{\protect\numberline{#2}#3}% + \fi + }{}% + } + } +} + + +%. 注 +% 文字サイズは6ポイントくらい（4.2.3.a）とりあえす\scriptsize +%.. 合印（4.2.3） +\newcommand*\jlreq@referencemark@format[1]{#1} +\newif\ifjlreqadjustreferencemark +\jlreqadjustreferencemarktrue +\jlreq@jlreqsetup@add{reference_mark}[inline,interlinear]{ + \def\jlreq@referencemark{#1} + \ifthenelse{\equal{\jlreq@referencemark}{inline}}{ + \def\jlreq@notemark##1{% + \jlreq@ifydir{% + \hbox{}\hbox{\@textsuperscript{\normalfont\jlreq@referencemark@format{##1}}}\hbox{}% + }{% + \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}% + \raise\dimexpr.5\jlreq@gol - \ht\@tempboxa\relax\box\@tempboxa + }% + } + \def\jlreq@hook@prenote{\inhibitglue} + \def\jlreq@hook@postnote{\inhibitglue} + }{% reference_mark=interlinear + \def\jlreq@notemark##1{{% + \setbox\@tempboxa=\hbox{\scriptsize\jlreq@referencemark@format{##1}}% + \@tempdima=\wd\@tempboxa + % 行頭に来たときに頭を天にそろえる処理． + \ifjlreqadjustreferencemark + \jlreq@savepos@for@rest@linewidth + \ifdim\jlreq@current@linewidth<\wd\@tempboxa + \@tempdima=\jlreq@current@linewidth + \fi + \fi + \setbox\jlreq@tempboxb=\hbox{阿}% + \setbox\jlreq@tempboxa=\hbox to\z@{\hskip-\@tempdima\raise\dimexpr\ht\jlreq@tempboxb + \dp\@tempboxa\relax\box\@tempboxa\hss}% + \dp\jlreq@tempboxa=0pt\ht\jlreq@tempboxa=0pt\box\jlreq@tempboxa% + }}% + \ifx l\jlreq@engine + \def\jlreq@hook@prenote{% + \jlreq@lastnodechar=\lastnodechar\relax + \ifnum\lastnodechar>-1\inhibitglue\fi + } + \else + % (u)platexの時は代入すると\inhibitglueが効かなくなる + \def\jlreq@hook@prenote{% + \ifnum\lastnodechar>-1\inhibitglue\fi + \jlreq@lastnodechar=\lastnodechar\relax + } + \fi + \def\jlreq@hook@postnote{\jlreq@fixjfm} + } +} +\jlreqsetup{reference_mark=inline} +% \@footnotemarkをシンプルなものにする +\def\jlreq@setdefaultnotemark#1#2{% + \def#1{% + \leavevmode + \ifhmode\edef\@x@sf{\the\spacefactor}\nobreak\fi + #2% + \ifhmode\spacefactor\@x@sf\fi + \relax}% +} +\jlreq@setdefaultnotemark\@footnotemark\@makefnmark + +%.. 脚注（4.2.5） +% （縦書きの時は傍注，4.2.6） +% 罫線の前は行間分，最大＋文字サイズ分伸びる（4.2.5.g） +\setlength{\skip\footins}{\dimexpr\baselineskip - 1\jlreq@gol \relax plus 1\jlreq@gol} +% 罫線の長さは，基本版面で設定した行長にもよるが，行長の1/3くらいにする． +\def\jlreq@footnote@rulewidth{.333\textwidth} +\begingroup + \footnotesize + \edef\jlreq@do{ + \unexpanded{\setlength{\footnotesep}}{\the\dimexpr .7\baselineskip\relax}% 何でかわからん…… + \unexpanded{\def\footnoterule}{% + % この罫線は，表罫（おもてけい）とする． + \unexpanded{\hrule width \jlreq@footnote@rulewidth height \jlreq@omotekeiwidth}% + % 脚注の行間よりやや広くする（4.2.5.f） + \noexpand\kern\the\dimexpr 1.5\dimexpr\baselineskip - 1\zh\relax\relax + } + } +\expandafter\endgroup +\jlreq@do + +% インデントの計算：脚注の長さが文字の整数倍になるように字下げする（4.2.5.b） +\jlreq@jlreqsetup@add{footnote_indent}{% + \if@tate\else + \ifdim\dimexpr#1\relax=0pt\else\jlreq@note{脚注は，一般にその前に区切りのための罫線を挿入するので，字下げは行わなくてよい（4.2.5.b）．}\fi + \fi + \begingroup + \footnotesize + \jlreq@footnoteindent=\dimexpr#1\relax + \@tempdima=\dimexpr\textwidth - \jlreq@footnoteindent\relax + \@tempdimb=1\zw + \divide\@tempdima\@tempdimb \multiply\@tempdima\@tempdimb + \edef\jlreq@do{\noexpand\jlreq@footnoteindent=\the\dimexpr\textwidth - \@tempdima\relax}% + \expandafter\endgroup + \jlreq@do +} +\if@tate + \jlreqsetup{footnote_indent=1\zw}% 根拠なし +\else + \jlreqsetup{footnote_indent=0pt}% （4.2.5.b） +\fi + +\newcommand{\@makefntext}[1]{\jlreq@makefntext{#1}} +\jlreq@jlreqsetup@add{footnote_second_indent}{% + \if@tate\else + \ifthenelse{ + \( \lengthtest{0.99\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < 1.01\zw} \) \OR + \( \lengthtest{-1.01\zw < \dimexpr #1\relax} \AND \lengthtest{\dimexpr #1\relax < -0.99\zw} \) + }{}{\jlreq@note{脚注が2行以上となった場合，脚注の2行目以下の字下げを1行目より，脚注の文字サイズの全角アキとするか，逆に，1行目の字下げを2行目より，脚注の文字サイズの全角アキとする (4.2.5.d)．}} + \fi + \ifdim\dimexpr #1\relax<0pt + \def\jlreq@makefntext{} + \else + \def\jlreq@makefntext{\addtolength{\leftskip}{\glueexpr #1\relax}} + \fi + \long\edef\jlreq@makefntext##1{\expandonce{\jlreq@makefntext}% + \unexpanded{% + \addtolength{\leftskip}{\jlreq@footnoteindent}% + \parindent=1\zw + \noindent + \hskip-\glueexpr #1\relax + \jlreq@referencemark@format{\@thefnmark}% + \hskip\glueexpr 1\zw\relax + }##1% + } +} +\jlreqsetup{footnote_second_indent=1\zw} + +\jlreq@jlreqsetup@add{footnotetext_indent}{ + \ClassWarningNoLine{jlreq}{footnotetext_indent was removed} +} + +\ifx l\jlreq@engine + \fnfixbottomtrue +\fi + +% \footnoteと\footnotemarkの前後に\jlreq@hook@prenote/\jlreq@hook@postnoteを入れる +\jlreq@saveoriginalcs{\footnote} +\jlreq@saveoriginalcs{\footnotemark} +\def\footnote{% + \jlreq@hook@prenote + \@ifnextchar[{\jlreq@footnote@impl@woption}{\jlreq@footnote@impl@wooption}% +} +\def\footnotemark{% + \jlreq@hook@prenote + \@ifnextchar[{\jlreq@footnotemark@impl@woption}{\jlreq@footnotemark@impl@wooption}% +} +\if@tate + % 縦組の傍注は，その見開き内に付いている合印に対応する注を，奇数ページの左端にそろえて配置する．多段組では最下段の左端にそろえて配置する．（4.2.6.a） + % 必要ならば\footnoteを\footnotemarkと\footnotetextにわけ，\footnotetextをアウトプット時まで遅延することで実現する． + \def\jlreq@footnote@delayfootnoteslist{} + \preto\@opcol{% + \expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}% + \jlreq@footnote@delayfootnoteslist + } + % \jlreq@footnote@delayfootnote@delay#1#2#3：#1ページ目に\footnotetext[#2]{#3}を出す + % \jlreq@footnote@delayfootnote@page：何ページ目に\footnotetextを入れるかを\jlreq@resultcntに入れる．その場での場合は-1． + \if@twocolumn + \def\jlreq@footnote@delayfootnote@page{% + \jlreq@setcurrentpage + \jlreq@resultcnt=\numexpr\jlreq@currentpage\ifodd\jlreq@currentpage\else + 1\fi\relax + % このページに表示＆上の段処理済みだと\output内では間に合わない + \ifnum\jlreq@resultcnt=\value{page}\if@firstcolumn\else\jlreq@resultcnt=-1 \fi\fi + } + \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{% + % 二段組みの場合は上段を組んだ直後に\footnotetextを挿入（そのページの下段に入る） + \ifnum 0\if@firstcolumn\else 1\fi\ifnum#1>\value{page}1\fi>0 + \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% + \else + \footnotetext[#2]{#3}% + \fi + } + \else + \def\jlreq@footnote@delayfootnote@page{% + \jlreq@setcurrentpage + \ifodd\jlreq@currentpage + \jlreq@resultcnt=-1 + \else + \jlreq@resultcnt=\numexpr\jlreq@currentpage+1\relax + \fi + } + \long\def\jlreq@footnote@delayfootnote@delay#1#2#3{% + % 一段組の場合はその前のページを組んだ直後に\footnotetextを挿入． + \ifnum\numexpr#1 - 1\relax>\value{page}% + \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% + \else + \footnotetext[#2]{#3}% + \fi + } + \fi + \def\jlreq@footnote@delayfootnote@immediate#1#2#3{% + \ifnum #1<\jlreq@currentpage + \xappto\jlreq@footnote@delayfootnoteslist{\unexpanded{\jlreq@footnote@delayfootnote{#1}{#2}{#3}}}% + \else + \footnotetext[#2]{#3}% + \fi + } + \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay + \def\jlreq@footnote@flushdelayfootnoteslist{% + \ifx\jlreq@footnote@delayfootnoteslist\@empty\else + \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@immediate + \jlreq@setcurrentpage + \expandafter\gdef\expandafter\jlreq@footnote@delayfootnoteslist\expandafter{\expandafter}% + \jlreq@footnote@delayfootnoteslist + \let\jlreq@footnote@delayfootnote=\jlreq@footnote@delayfootnote@delay + \fi + } + \AtEndDocument{\jlreq@footnote@flushdelayfootnoteslist} + \preto\newpage{\jlreq@footnote@flushdelayfootnoteslist} + \long\def\jlreq@footnote@impl@woption[#1]#2{% + \jlreq@footnote@delayfootnote@page + \ifnum\jlreq@resultcnt=-1 + \jlreq@useoriginalcs{\footnote}[#1]{#2}% + \else + \jlreq@useoriginalcs{\footnotemark}[#1]% + \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\unexpanded{#1}}{\unexpanded{#2}}}% + \fi + \jlreq@hook@postnote + } + \long\def\jlreq@footnote@impl@wooption#1{% + \jlreq@footnote@delayfootnote@page + \ifnum\jlreq@resultcnt=-1 + \jlreq@useoriginalcs{\footnote}{#1}% + \else + \jlreq@useoriginalcs{\footnotemark}% + \xappto\jlreq@footnote@delayfootnoteslist{\noexpand\jlreq@footnote@delayfootnote{\the\jlreq@resultcnt}{\the\value{footnote}}{\unexpanded{#1}}}% + \fi + \jlreq@hook@postnote + } +\else + \long\def\jlreq@footnote@impl@woption[#1]#2{% + \jlreq@useoriginalcs{\footnote}[#1]{#2}% + \jlreq@hook@postnote + } + \long\def\jlreq@footnote@impl@wooption#1{% + \jlreq@useoriginalcs{\footnote}{#1}% + \jlreq@hook@postnote + } +\fi +\long\def\jlreq@footnotemark@impl@woption[#1]{% + \jlreq@useoriginalcs{\footnotemark}[#1]% + \jlreq@hook@postnote +} +\long\def\jlreq@footnotemark@impl@wooption{% + \jlreq@useoriginalcs{\footnotemark}% + \jlreq@hook@postnote +} + +% 合印 +\renewcommand*{\@makefnmark}{% + \jlreq@ifydir{\jlreq@notemark{\@thefnmark}}{\hbox{\jlreq@notemark{\@thefnmark}}}% +} +% 4.2.2注3 +\if@tate + \renewcommand*{\thefootnote}{\jlreq@open@bracket@before@space\inhibitglue（\jlreq@rensuji{\@arabic\c@footnote}）\inhibitglue} +\else + \renewcommand*{\thefootnote}{\arabic{footnote}\hbox{}）\inhibitglue} +\fi +\ifthenelse{\equal{\jlreq@article@type}{article}}{}{\@addtoreset{footnote}{chapter}} + + +%.. 後注（4.2.4） +\def\jlreq@endnotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名 +\def\jlreq@endnotecounter{footnote}% 後注用のカウンタ名 +% 文字サイズは\footnotesizeを使う +\newdimen\jlreq@endnote@prepostspace +% 前の分との間は行間分空ける（4.2.4.f） +\jlreq@endnote@prepostspace=\dimexpr\baselineskip - 1\jlreq@gol\relax +\newdimen\jlreq@endnote@indent +% 現在の後注一覧を，\jlreq@endnote@textsに{{合印1}{後注1}}{{合印2}{後注2}}...の形で保持する +\def\jlreq@endnote@texts{} +\long\def\jlreq@endnote@addtext#1#2{\xappto\jlreq@endnote@texts{\unexpanded{{{#1}{#2}}}}} +% \endnote自身は後で定義する +\def\jlreq@endnote@impl{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnote}{\jlreq@endnote[]}} +\def\endnotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@endnotemark}{\jlreq@endnotemark[]}} +\def\endnotetext{\@ifnextchar[{\jlreq@endnotetext}{\jlreq@endnotetext[]}} +\long\def\jlreq@endnote[#1]#2{\jlreq@endnotemark[#1]\@endnotetext{#2}\jlreq@hook@postnote} +\def\jlreq@endnotemark[#1]{% + \jlreq@ifempty{#1}{% + \stepcounter{\jlreq@endnotecounter}% + \expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% + }{% + \begingroup + \csname c@\jlreq@endnotecounter\endcsname #1\relax + \expandafter\unrestored@protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% + \endgroup + }% + \@endnotemark + \jlreq@hook@postnote +} +\jlreq@setdefaultnotemark\@endnotemark\@makeendmark +\long\def\jlreq@endnotetext[#1]#2{% + \jlreq@ifempty{#1}{% + \expandafter\protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% + }{% + \begingroup + \csname c@\jlreq@endnotecounter\endcsname #1\relax + \expandafter\unrestored@protected@xdef\csname\jlreq@endnotemarkname\endcsname{\csname the\jlreq@endnotecounter\endcsname}% + \endgroup + }% + \@endnotetext{#2}% +} +\long\def\@endnotetext#1{% + \expandafter\let\expandafter\jlreq@tempa\expandafter=\csname\jlreq@endnotemarkname\endcsname + \expandafter\jlreq@endnote@addtext\expandafter{\jlreq@tempa}{#1}% +} +\long\def\jlreq@theendnotes#1{% + \jlreq@ifendmark{#1}{}{% + \jlreq@output@endnotes#1 + \jlreq@theendnotes + }% +} +\long\def\jlreq@output@endnotes#1#2{% + \expandafter\def\csname\jlreq@endnotemarkname\endcsname{#1}% + \item\@makeendtext{#2}% +} + +\newcommand*{\theendnotes}{% + \ifx\jlreq@endnote@texts\@empty\else + \let\jlreq@tempa=\jlreq@endnote@texts + \gdef\jlreq@endnote@texts{}% + \edef\jlreq@endnote@beforeafterspace{\the\dimexpr\baselineskip - 1\jlreq@gol\relax plus \the\dimexpr 1\jlreq@gol\relax}% + \begingroup + \par + \footnotesize + % 後注の長さを文字サイズの整数倍にする（4.2.4.b） + \jlreq@tempdima=\dimexpr\linewidth - \jlreq@endnote@indent - \leftskip\relax + \@tempdimb=1\jlreq@mol + \divide\jlreq@tempdima\@tempdimb\multiply\jlreq@tempdima\@tempdimb + \begin{list}{}{% + \itemsep=0pt\relax + \parsep=0pt\relax + \partopsep=0pt\relax + \topsep=0pt\relax + \leftmargin=\dimexpr\linewidth - \jlreq@tempdima + \jlreq@endnote@second@indent\relax + \itemindent=-\glueexpr\jlreq@endnote@second@indent\relax + \topsep=\jlreq@endnote@beforeafterspace\relax + \listparindent=1\zw + }% + \expandafter\jlreq@theendnotes\jlreq@tempa\jlreq@endmark + \end{list}% + \endgroup + \par + \fi +} +% 4.2.4.b +\jlreq@endnote@indent=2\jlreq@mol +\jlreq@jlreqsetup@add{endnote_second_indent}{ + \def\jlreq@endnote@second@indent{#1} + \ifthenelse{ + \( \lengthtest{0.99\zw < #1} \AND \lengthtest{#1 < 1.01\zw} \) \OR + \( \lengthtest{1.99\zw < #1} \AND \lengthtest{#1 < 2.01\zw} \) + }{}{\jlreq@note{後注が2行以上となった場合，後注の2行目以下の字下げは，1行目より，後注の文字サイズの2倍又は全角とする (4.2.4.d)．}} +} +\jlreqsetup{endnote_second_indent=2\zw} +\newcommand{\@makeendtext}[1]{% + \csname\jlreq@endnotemarkname\endcsname + \hskip\glueexpr1\zw\relax% 見出し出力と一文字分の空き（4.2.4.c） + #1% +} +\let\@makeendmark=\@makefnmark + +% \theendnoteの出力を仕込む +\apptocmd{\jlreq@hook@beforeheadings}{\jlreq@endnote@hook@beforeheadings{#1}}{}{} + +\jlreq@jlreqsetup@add{endnote_position}{ + \def\jlreq@endnote@hook@beforeheadings##1{} + \jlreq@tempafalse % headingsが指定された + \jlreq@tempbfalse % paragraphが指定された + % \jlreq@tempcにセクション名たちを入れていく + \def\jlreq@tempc{} + \@for\jlreq@tempa:=#1\do{ + \expandafter\jlreq@remove@spaceandbracket\expandafter{\jlreq@tempa}{\jlreq@tempa}% + \jlreq@switch{\jlreq@tempa}{ + {headings}{\jlreq@tempatrue} + {paragraph}{ + \jlreq@tempatrue% _paragraphの時は_headingsも有効にする + \jlreq@tempbtrue + } + { + \expandafter\jlreq@iffirsttoken@ignorespaces\expandafter{\jlreq@tempa}{_}{ + \edef\jlreq@tempc{\jlreq@tempc,\expandafter\@gobble\jlreq@tempa} + }{ + \ClassError{jlreq}{Invalid value \jlreq@tempa\space in endnote_position}{\@ehc} + } + } + } + } + + \ifjlreq@tempb + \edef\endnote{\unexpanded{\def\par{\@restorepar\theendnotes\par}}\expandonce{\jlreq@endnote@impl}} + \else + \let\endnote=\jlreq@endnote@impl + \fi + + \ifjlreq@tempa + \apptocmd{\jlreq@endnote@hook@beforeheadings}{\theendnotes}{}{} + \else + \@for\@tempa:=\jlreq@tempc\do{ + \ifx\@tempa\@empty\else + \edef\jlreq@do{% + \unexpanded{\def\jlreq@endnote@hook@beforeheadings##1}{\expandonce{\jlreq@endnote@hook@beforeheadings{##1}}% + \unexpanded{\def\@tempa}{\@tempa}\unexpanded{\def\@tempb{##1}}% + \unexpanded{\ifx\@tempa\@tempb\theendnotes\fi}% + } + } + \jlreq@do + \fi + } + \fi +} +\jlreqsetup{endnote_position=headings} +\AtEndDocument{\theendnotes} + + +% (1) \footnoteとかと同じ形式 sidenote_type=number +% (2) 文中にマークを入れて，傍注には見出しが入る sidenote_type=symbol +% (3) 文中は強調文字列，傍注には見出しが入る sidenote_type=symbol +% (4) 文中は何も無し，傍注には見出しが入る sidenote_type=symbol + +% (1) では\sidenote[]{}を定義 +% (2) では\sidenote{見出し}{注中身}を定義 +% \marginparwidth>0ptの時のみ定義する +\ifdim\marginparwidth>0pt \expandafter\@firstofone\else\expandafter\@gobble\fi +{ + \def\jlreq@sidenotemarkname{@thefnmark}% 合印用番号を一時的に入れるマクロ名 + \long\def\@sidenotetext#1{% + \marginpar{\reset@font\footnotesize + \color@begingroup + \@makesidetext{#1}% + \color@endgroup + }% + } + \jlreq@setdefaultnotemark\@sidenotemark\@makesidemark + \def\jlreq@sidenotecounter{footnote}% 傍注用のカウンタ名 + \jlreq@jlreqsetup@add{sidenote_type}[number,symbol]{\def\jlreq@sidenote@type{#1}} + \jlreqsetup{sidenote_type=number} + \jlreq@jlreqsetup@addtofinally{ + \ifthenelse{\equal{\jlreq@sidenote@type}{number}}{ + \def\sidenote{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenote}{\jlreq@sidenote[]}} + \def\sidenotemark{\jlreq@hook@prenote\@ifnextchar[{\jlreq@sidenotemark}{\jlreq@sidenotemark[]}} + \def\sidenotetext{\@ifnextchar[{\jlreq@sidenotetext}{\jlreq@sidenotetext[]}} + \long\def\jlreq@sidenote[#1]#2{\jlreq@sidenotemark[#1]\@sidenotetext{#2}\jlreq@hook@postnote} + \def\jlreq@sidenotemark[#1]{% + \jlreq@ifempty{#1}{% + \stepcounter{\jlreq@sidenotecounter}% + \expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% + }{% + \begingroup + \csname c@\jlreq@sidenotecounter\endcsname #1\relax + \expandafter\unrestored@protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% + \endgroup + }% + \@sidenotemark + \jlreq@hook@postnote + } + \long\def\jlreq@sidenotetext[#1]#2{% + \jlreq@ifempty{#1}{% + \expandafter\protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% + }{% + \begingroup + \csname c@\jlreq@sidenotecounter\endcsname#1\relax + \expandafter\unrestored@protected@xdef\csname\jlreq@sidenotemarkname\endcsname{\csname the\jlreq@sidenotecounter\endcsname}% + \endgroup + }% + \@sidenotetext{#2}% + } + % \hspace{0.5\jlreq@mol}の部分は二分空きにする例もある（4.2.7.g） + \ifx l\jlreq@engine + \long\def\@makesidetext#1{\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1} + \else + % thefootnote = \inhibitglue （...だと\inhibitglueが効かないので空白を挟む + \long\def\@makesidetext#1{　\kern-1\zw\csname\jlreq@sidenotemarkname\endcsname\hspace{0.5\jlreq@mol}#1} + \fi + \let\@makesidemark=\@makefnmark + }{% sidenote_type = symbol + \long\def\sidenote#1#2{\jlreq@sidenote{#1}{#2}} + \def\sidenotemark#1{\jlreq@sidenotemark{#1}} + \long\def\sidenotetext#1#2{\jlreq@sidenotetext{#1}{#2}} + \long\def\jlreq@sidenote#1#2{\jlreq@sidenotemark{#1}\jlreq@sidenotetext{#1}{#2}} + \edef\jlreq@sidenotemark#1{% + {\unexpanded{\reset@font\jlreq@sidenote@keywordfont}#1}% + \noexpand\jlreq@hook@prenote + \ifx\jlreq@sidenote@defaultmark\@empty\else + \expandafter\edef\expandonce{\csname\jlreq@sidenotemarkname\endcsname}{\expandonce{\jlreq@sidenote@defaultmark}}% + \noexpand\@sidenotemark + \fi + } + % カスタマイズできるべき？ + \long\def\jlreq@sidenotetext#1#2{% + \expandafter\def\csname\jlreq@sidenotemarkname\endcsname{\inhibitglue\null{\reset@font\sffamily\bfseries\inhibitglue #1}}% + \@sidenotetext{#2}% + } + \long\def\@makesidetext#1{{\sffamily\bfseries\csname\jlreq@sidenotemarkname\endcsname}\hspace*{1\jlreq@mol}#1} + \let\@makesidemark=\@makefnmark + + \apptocmd{\sidenote}{\jlreq@hook@postnote}{}{} + \apptocmd{\sidenotemark}{\jlreq@hook@postnote}{}{} + } + } + \jlreq@jlreqsetup@add{sidenote_symbol}{\def\jlreq@sidenote@defaultmark{#1}} + \jlreq@jlreqsetup@add{sidenote_keyword_font}{\def\jlreq@sidenote@keywordfont{#1}} + \jlreqsetup{sidenote_symbol=＊,sidenote_keyword_font={}} +} + +%.. 割注（3.4） +\def\inlinenotesize{.6\jlreq@jafontsize} % 割注の文字サイズ +\let\jlreq@inlinenote@autolinebreak=\\% 計測時は\linebreakより\\の方が安定する．悩ましい……． + +\newcommand{\jlreq@inlinenote@kakkofontsize}{% + \fontsize{\dimexpr\inlinenotesize * 2\relax}{\dimexpr \inlinenotesize * 2\relax}% + \selectfont +} + +\newcommand{\jlreq@inlinenote@fontsize}{% + \fontsize{\inlinenotesize}{\inlinenotesize}% + \selectfont +} + +% 割注を入れるための命令．\inlinenote{割注}で使う． +% 改行位置は自動で計算されるが，常に正しいとは限らない． +% \inlinenote*は自動で改行されない．\\で改行位置を指定する． +\newif\ifjlreq@in@inlinenote +\jlreq@in@inlinenotefalse +\newcommand*{\inlinenote}{% + \ifjlreq@in@inlinenote\ClassError{jlreq}{\string\inlinenote\space can't be nested}{\@ehc}\fi + \jlreq@in@inlinenotetrue + \ifvmode\leavevmode\fi + \@ifstar\jlreq@inlinenote@noauto\jlreq@inlinenote@auto} +\let\warichu=\inlinenote + +\newcommand*{\jlreq@inlinenote@auto}[1]{% + % 割注初め括弧の前の場所を保存 + \jlreq@savepos@for@rest@linewidth + % \jlreq@tempdimbに，現在行の残り長さを入れる + \jlreq@tempdimb=\jlreq@rest@linewidth + % 括弧の分を引いたものが，割注の使える長さ + \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（\inhibitglue}% + \addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}% + \ifdim\jlreq@tempdimb<0pt\jlreq@tempdimb=\linewidth\fi + {% + \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue \jlreq@open@bracket@before@space（}% + \jlreq@box@putcenter\jlreq@tempboxa + }% + % 「初回」時はここに強制改行を入れる．これにより現在位置の取得がより正しくなる……といいなぁ + \jlreq@savepos@iflabelundefined{\\}{}% + % 割注内の\baselineskipを保存（後で使う）． + {\jlreq@inlinenote@fontsize\xdef\jlreq@inlinenote@baselineskip{\the\baselineskip}}% + % 普通に並べた長さを計測し，その半分から始める + \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize #1}% + \jlreq@tempdimc=\wd\@tempboxa + \divide\jlreq@tempdimc by 2\relax + % \@tempcntbに，この長さで計測した場合の行数を入れる + \ifdim\jlreq@tempdimc<\jlreq@tempdimb\@tempcntb=2\relax + \else + \jlreq@tempdima=\dimexpr\jlreq@tempdimc - \jlreq@tempdimb\relax + \divide\jlreq@tempdima\linewidth + \@tempcntb=\number\jlreq@tempdima + \multiply\@tempcntb by 2\relax + \advance\@tempcntb by 4\relax + \fi + % \jlreq@parshapeargに\parshapeに指定する書式の最後以外を入れる． + \ifnum\@tempcntb>2\relax + \edef\jlreq@parshapearg{0pt \the\jlreq@tempdimb\space 0pt \the\jlreq@tempdimb}% + \@tempcnta=4\relax + \@whilenum\@tempcnta<\@tempcntb\do{% + \edef\jlreq@parshapearg{\jlreq@parshapearg\space 0pt \the\linewidth\space 0pt \the\linewidth}% + \advance\@tempcnta by 2\relax + }% + \setlength{\jlreq@tempdimc}{\dimexpr\jlreq@tempdimc - \jlreq@tempdimb - \linewidth * \numexpr(\@tempcntb - 4)/2\relax\relax}% + \else + \def\jlreq@parshapearg{}% + \fi + % 行数を伸ばしつつ良いところを探していく + \@whilenum\@tempcntb<1001\do{% + \ifnum\@tempcntb>2\jlreq@tempdimb=\linewidth\fi + \edef\@tempb{\the\@tempcntb}% + \jlreq@inlinenote@determinelength{#1}{\jlreq@inlinenote@fontsize}{\jlreq@parshapearg}{2}{\@tempb}{\jlreq@tempdimc}{\jlreq@tempdimb}% + \@tempcntb=\@tempb + \ifnum\@tempcntb>999\relax% ループが長すぎる + \global\setbox\jlreq@resultbox=\voidb@x% + \@tempcntb=1001\relax + \fi + \ifvoid\jlreq@resultbox\else% 成功 + \edef\jlreq@inlinenote@lines{\the\@tempcntb}% 行数を保存 + \@tempcntb=1001\relax + \fi + \advance\@tempcntb by 2\relax + \edef\jlreq@parshapearg{\jlreq@parshapearg 0pt \the\jlreq@tempdimb 0pt \the\jlreq@tempdimb}% + }% + \ifvoid\jlreq@resultbox + \ClassWarning{jlreq}{\string\warichu\space failed, may be a bug}% + \else + \@tempcnta=0 + \splittopskip=0pt\relax + \splitmaxdepth=\maxdimen + % 現在行の残り長さを思い出す + \jlreq@tempdimb=\jlreq@rest@linewidth + \setbox\@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（\inhibitglue}% + \addtolength{\jlreq@tempdimb}{-\wd\@tempboxa}% + \setbox\@tempboxa=\box\jlreq@resultbox + \@whilenum\@tempcnta<\jlreq@inlinenote@lines\do{% + \ifnum\@tempcnta>0 \jlreq@inlinenote@autolinebreak\fi + % \jlreq@tempdimaに今の行の長さを入れる + \ifnum\@tempcnta<\numexpr\jlreq@inlinenote@lines - 2\relax + \ifnum\@tempcnta=0\jlreq@tempdima=\jlreq@tempdimb + \else\jlreq@tempdima=\linewidth\fi + \else + % 最終行は自然長に任せる + \jlreq@tempdima=-1pt\relax + \fi + {% + \edef\@tempa{\the\vbadness}% + \vbadness=10000 + \setbox\jlreq@tempboxa=\vsplit\@tempboxa to \dimexpr\jlreq@inlinenote@baselineskip*2\relax + \vbadness=\@tempa\relax + \jlreq@getlastbox{\jlreq@tempboxa}% + \setbox\jlreq@tempboxb=\box\jlreq@resultbox + \jlreq@getlastbox{\jlreq@tempboxa}% + \setbox\jlreq@tempboxa=\box\jlreq@resultbox + \ifdim\jlreq@tempdima>0pt\relax + \setbox\jlreq@tempboxa=\vbox{\jlreq@inlinenote@fontsize + \hbox to \jlreq@tempdima{\unhbox\jlreq@tempboxa}% + \hbox to \jlreq@tempdima{\unhbox\jlreq@tempboxb}}% + \else + \setbox\jlreq@tempboxa=\vbox{\jlreq@inlinenote@fontsize + \hbox{\unhbox\jlreq@tempboxa}% + \hbox{\unhbox\jlreq@tempboxb}}% + \fi + \jlreq@box@putcenter\jlreq@tempboxa + }% + \advance\@tempcnta by 2\relax + }% + \fi + \jlreq@inlinenote@endnote +} + +\newcommand*{\jlreq@inlinenote@noauto}[1]{% + \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize\inhibitglue\jlreq@open@bracket@before@space（}% + \inhibitglue\jlreq@box@putcenter\jlreq@tempboxa + \jlreq@inlinenote@noauto@#1\\\jlreq@endmark\jlreq@endmark + \jlreq@inlinenote@endnote +} + +\def\jlreq@inlinenote@noauto@#1\\#2#3\jlreq@endmark{% + \jlreq@inlinenote@noauto@@#1&\jlreq@endmark\jlreq@endmark + \jlreq@ifendmark{#2}{}{\linebreak\jlreq@inlinenote@noauto@#2#3\jlreq@endmark}% +} + +\def\jlreq@inlinenote@noauto@@#1#3\jlreq@endmark{% + \jlreq@ifendmark{#2}{% + \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize #1}% + \jlreq@tempdimc=\wd\@tempboxa + \divide\jlreq@tempdimc by 2\relax + \jlreq@inlinenote@determinelength{#1}{\jlreq@inlinenote@fontsize}{}{2}{2}{\jlreq@tempdimc}{\maxdimen}% + \ifvoid\jlreq@resultbox\else + {% + \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@fontsize\box\jlreq@resultbox}% + \jlreq@box@putcenter\jlreq@tempboxa + }% + \fi + \def\jlreq@next{}% + }{% + \def\jlreq@next{\jlreq@inlinenote@noauto@@@{#1}#2#3}% + }% + \jlreq@next +} + +\def\jlreq@inlinenote@noauto@@@#1#2&\jlreq@endmark{% + \setbox\@tempboxa=\hbox{\jlreq@inlinenote@fontsize\vbox{\hbox{#1}\hbox{#2}}}% + \jlreq@box@putcenter\@tempboxa +} + +\newcommand{\jlreq@inlinenote@endnote}{% + \jlreq@in@inlinenotefalse + {% + \setbox\jlreq@tempboxa=\hbox{\jlreq@inlinenote@kakkofontsize）}% + \jlreq@box@putcenter\jlreq@tempboxa + \inhibitglue + }% +} + +% \jlreq@inlinenote@determinelength{テキスト(1)}{フォントとか指定(2)}{\parshape指定(3)}{調整に使う行数(4)}{成功行数(5)}{最小長さ(6)}{最大長さ(7)} +% 次を満たす長さXの最小値を求める（ただし#6 <= X <= #7） +% #1を +% * #5 - #4行目までは#3の指定に従う +% * それ以降はX +% として整形した際に，#5行以内に収まる． +% \jlreq@resultboxに整形結果を返す（垂直ボックス）．見つからなかったらvoid．\globalに設定する． +\newcommand{\jlreq@inlinenote@determinelength}[7]{% +% \message{#1 の試行開始，行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relaxまで}% + \@tempcnta=1\relax + \def\@tempa{}% + % 調整に使う行の\parshape指定を\@tempaに入れる．長さは\jlreq@tempdima． + \@whilenum\@tempcnta<#4\do{% + \expandafter\def\expandafter\@tempa\expandafter{\@tempa 0pt \the\jlreq@tempdima}% + \advance\@tempcnta by 1\relax + }% + \@tempcnta=0 + \jlreq@tempdima=#6\relax + % \jlreq@tempdimaを少しずつ伸ばしていく + \@whilenum\@tempcnta<1000\do{% + \ifnum\@tempcnta>999\relax% ループが長すぎる + \global\setbox\jlreq@resultbox=\voidb@x% + \@tempcnta=1001\relax + \else + \setbox\@tempboxa=\vbox{#2% + \vbadness=10000\hbadness=10000\vfuzz=\maxdimen\hfuzz=\maxdimen + \parindent=0pt\leftskip=0pt\rightskip=0pt + \parshape #5 #3 \@tempa 0pt \the\maxdimen + #1\par\global\@tempcntb=\prevgraf}% +% \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行，行数は\the\@tempcntb , 書式 #5 #3 \@tempa 0pt \the\maxdimen}% + \fi + \jlreq@getlastbox{\@tempboxa}% + \setbox\jlreq@tempboxa=\box\jlreq@resultbox + \ifnum\@tempcntb<#5\relax% 行数が達していないならOK +% \message{行数 = \the\@tempcntb により確定} + % #5行になるまで空の水平ボックスを加えていく． + \global\setbox\jlreq@resultbox=\vbox{#2% + \unvbox\@tempboxa\hbox{\unhbox\jlreq@tempboxa\unskip\unskip\unpenalty}% + \@whilenum\@tempcntb<#5\do{\hbox{}\advance\@tempcntb by 1}}% + \@tempcnta=1001\relax + \else + % そうでない場合は最後の二行の長さを比較する + \jlreq@getlastbox{\@tempboxa}% + \setbox\jlreq@tempboxb=\box\jlreq@resultbox +% \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}% + \ifdim\wd\jlreq@tempboxa>\wd\jlreq@tempboxb + \advance\jlreq@tempdima by 0.3pt\relax% 0.3ptに意味はない + \else + % 後ろが短いのでOK + \global\setbox\jlreq@resultbox=\vbox{#2\unvbox\@tempboxa\box\jlreq@tempboxb\box\jlreq@tempboxa}% + \jlreq@resultdimen=\jlreq@tempdima + \@tempcnta=1001\relax + \fi + \fi + \ifdim\jlreq@tempdima>#7\relax + \global\setbox\jlreq@resultbox=\box\voidb@x + \@tempcnta=1001\relax + \fi + \advance\@tempcnta by 1\relax + }% +} + +%. ページスタイル． +% メモ： +% 2.6.1.cの後半が前半と整合的でないように見える…… +% 柱：両柱と片柱（2.6.3） +\@tempdima=\jlreq@speciallength{\jlreq@headfoot@sidemargin} +\ifthenelse{\lengthtest{\@tempdima=0pt} \OR \(\lengthtest{0.99\zw < \@tempdima} \AND \lengthtest{\@tempdima < 1.01\zw}\)}{}{ + \jlreq@note{ノンブルまたは柱は，基本版面の左右にそろえるか，全角アキだけ寄せた位置に配置する (2.6.1.b)．} +} + +%.. 場所指定解析 +% bottom-leftみたいなのを解釈する．入力の順番はどっちでも良いが，出力はの順番 +% #1 = bottom-leftみたいなのを{bottom}{left}に変換し，#2に代入，#3はデフォルト値，出力形式で入れる +\newcommand*{\jlreq@pagestyle@parse@position}[3]{% + \jlreq@ifempty{#1}{\def#2{#3}}% + {% + \begingroup + \jlreq@pagestyle@parse@position@#1-\jlreq@endmark + % \jlreq@tempcに縦方向を，\jlreq@tempdに横方向を入れる + \def\jlreq@tempc{}\def\jlreq@tempd{}% + \jlreq@pagestyle@parse@position@@{\jlreq@tempa}% + \jlreq@pagestyle@parse@position@@{\jlreq@tempb}% + \ifx\jlreq@tempc\@empty\edef\jlreq@tempc{\expandafter\@firstoftwo#3}\fi + \ifx\jlreq@tempd\@empty\edef\jlreq@tempd{\expandafter\@secondoftwo#3}\fi + \edef\jlreq@do{\unexpanded{\def#2}{{\jlreq@tempc}{\jlreq@tempd}}}% + \expandafter\endgroup + \jlreq@do + }% +} + +\def\jlreq@pagestyle@parse@position@#1-#2\jlreq@endmark{% + \def\jlreq@tempa{#1}\def\jlreq@tempb{#2}% + \jlreq@ifempty{#2}{% + \ifx\jlreq@tempb\@empty\ClassError{jlreq}{Invalid position: #1}{\@ehc}\fi + }{% + \def\@tempa##1-{\def\jlreq@tempb{##1}}% + \@tempa#2\relax + }% +} + +\newcommand*\jlreq@pagestyle@parse@position@@[1]{% + \jlreq@switch{#1}{ + {top}{\def\jlreq@tempc{#1}} + {bottom}{\def\jlreq@tempc{#1}} + {left}{\def\jlreq@tempd{#1}} + {right}{\def\jlreq@tempd{#1}} + {center}{\def\jlreq@tempd{#1}} + {gutter}{\if@tate\def\jlreq@tempd{right}\else\def\jlreq@tempd{left}\fi} + {fore_edge}{\if@tate\def\jlreq@tempd{left}\else\def\jlreq@tempd{right}\fi} + {\ClassError{jlreq}{Invalid position: #1}{\@ehc}} + }% +} + +% レベル#1より低いレベルの見出しの**markを\markboth{}{}にする +\def\jlreq@pagestyle@setclearmark#1{% + \@for\@tempa:=\jlreq@heading@allheadings\do{% + \@ifundefined{\@tempa}{}{% + \ifnum\csname jlreq@heading@level@\@tempa\endcsname<#1\relax\expandafter\def\csname\@tempa mark\endcsname##1{\markboth{}{}}\fi + }% + }% +} + +% #1のleftとrightを入れ替えて#1に代入 +\def\jlreq@reverse@leftright#1{% + \jlreq@switch{#1}{ + {left}{\def#1{right}} + {right}{\def#1{left}} + }% +} + +%.. マークの拡張 +% 三つ以上のマークを保持するために，markを次のようにする +% <マーク1>\jlreq@extramark{{<マーク2>}{<マーク3>}...} +\def\jlreq@extramark#1{} + +% #1番目の\leftmarkや\rightmarkを取得する．\leftmark/\rightmarkの実装に強く依存している． +\def\jlreq@extraleftmark#1{\jlreq@getextramark{#1}{\leftmark}}% +\def\jlreq@extrarightmark#1{\jlreq@getextramark{#1}{\rightmark}}% +\def\jlreq@getextramark#1#2{\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter\jlreq@getextramark@#2\jlreq@extramark\jlreq@endmark{#1}} +\def\jlreq@getextramark@#1\jlreq@extramark#2\jlreq@endmark#3{% + \jlreq@ifempty{#2}{}{\jlreq@getextramark@@{#3}#2}% +} +\def\jlreq@getextramark@@#1#2#3\jlreq@extramark{\jlreq@getextramark@@@{#1}#2\jlreq@endmark} +\def\jlreq@getextramark@@@#1#2{% + \jlreq@ifendmark{#2}{}{% + \ifnum#1=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {\jlreq@getextramark@@@@{#2}}{\expandafter\jlreq@getextramark@@@\expandafter{\the\numexpr #1-1\relax}}% + }% +} +\def\jlreq@getextramark@@@@#1#2\jlreq@endmark{#1} + +% トークン列#1に必要ならば\jlre@extramarkを加え，#2に代入 +\def\jlreq@addextramarkcommand#1#2{% + \jlreq@ifcontains{#1}{\jlreq@extramark}{\edef#2{\unexpanded{#1}}}{\edef#2{\unexpanded{#1\jlreq@extramark{}}}}% +} +\def\jlreq@addextramarkcommand@tothemark{% + \begingroup + \expandafter\expandafter\expandafter\jlreq@addextramarkcommand\expandafter\expandafter\expandafter{\expandafter\@firstoftwo\@themark}{\jlreq@tempa}% + \expandafter\expandafter\expandafter\jlreq@addextramarkcommand\expandafter\expandafter\expandafter{\expandafter\@secondoftwo\@themark}{\jlreq@tempb}% + \edef\jlreq@do{\unexpanded{\def\@themark}{{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}}}% + \expandafter\endgroup + \jlreq@do +} + +% #1番目を#2に置き換える +\def\jlreq@setextraleftmark#1#2{% + \let\jlreq@extramark@=\jlreq@extramark + \begingroup + \jlreq@addextramarkcommand@tothemark + \def\jlreq@extramark##1{\noexpand\jlreq@extramark{\jlreq@changeargument{##1}{#1}{#2}}}% + \protected@edef\jlreq@tempa{\expandafter\@firstoftwo\@themark}% + \def\jlreq@extramark{\noexpand\jlreq@extramark}% + \protected@edef\jlreq@tempb{\expandafter\@secondoftwo\@themark}% + \edef\@themark{{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}}% + \edef\jlreq@do{% + \unexpanded{\def\jlreq@extramark{\noexpand\jlreq@extramark}}% + \noexpand\markboth\expandonce{\@themark}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} +\def\jlreq@setextrarightmark#1#2{% + \let\jlreq@extramark@=\jlreq@extramark + \begingroup + \jlreq@addextramarkcommand@tothemark + \def\jlreq@extramark{\noexpand\jlreq@extramark}% + \protected@edef\jlreq@tempa{\expandafter\@firstoftwo\@themark}% + \def\jlreq@extramark##1{\noexpand\jlreq@extramark{\jlreq@changeargument{##1}{#1}{#2}}}% + \protected@edef\jlreq@tempb{\expandafter\@secondoftwo\@themark}% + \edef\@themark{{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}}% + \edef\jlreq@do{% + \unexpanded{\def\jlreq@extramark{\noexpand\jlreq@extramark}}% + \noexpand\markright{\expandonce{\jlreq@tempb}}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} + +% #1内の#2番目を#3に取り替える．\jlreq@changeargument{{arg1}{arg2}...{argk}}{n}{arg} +% k < nならば{}を加えた後{arg}を最後につける +\def\jlreq@changeargument#1#2#3{% + \jlreq@changeargument@{#2}{#3}#1\jlreq@endmark +} +\def\jlreq@changeargument@#1#2#3{% + \jlreq@ifendmark{#3}{% + \ifnum#1>0 \expandafter\@firstofone\else\expandafter\@gobble\fi + {\jlreq@changeargument@@{#1}{#2}}% + }{% + \ifnum#1=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {{#2}}{{#3}}% + \expandafter\jlreq@changeargument@\expandafter{\the\numexpr #1 - 1\relax}{#2}% + }% +} +\def\jlreq@changeargument@@#1#2{% + \ifnum#1<2 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{{#2}}{% + {}\expandafter\jlreq@changeargument@@\expandafter{\the\numexpr #1 -1 \relax}{#2}% + }% +} + +% \jlreq@cleararguments{k}{{arg1}...{argn}}を{arg1}...{argk}{}...{}にする +\def\jlreq@cleararguments#1#2{\jlreq@cleararguments@{#1}#2\jlreq@endmark} +\def\jlreq@cleararguments@#1#2{\jlreq@ifendmark{#2}{}{% + \ifnum#1<1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi + {{}}{{#2}}% + \expandafter\jlreq@cleararguments@\expandafter{\the\numexpr #1 - 1\relax}% + }% +} +% ...\jlreq@extramark{...}を\jlreq@extramark{...}のみにする． +\def\jlreq@getextramarkpart#1{\jlreq@getextramarkpart@#1\jlreq@extramark\jlreq@endmark} +\def\jlreq@getextramarkpart@#1\jlreq@extramark#2\jlreq@endmark{\jlreq@ifempty{#2}{}{\jlreq@getextramarkpart@@#2}} +\def\jlreq@getextramarkpart@@#1\jlreq@extramark{\jlreq@extramark{#1}} + +% #1番目以降を空にする +\def\jlreq@clearleftextramarks#1{% + \let\jlreq@extramark@=\jlreq@extramark + \begingroup + \def\jlreq@extramark##1{\noexpand\jlreq@extramark{\jlreq@cleararguments{#1}{##1}}}% + \protected@edef\jlreq@tempa{\expandafter\@firstoftwo\@themark}% + \edef\jlreq@tempb{\expandafter\expandafter\expandafter\expandonce\expandafter\expandafter\expandafter{\expandafter\@secondoftwo\@themark}}% + \edef\jlreq@do{% + \unexpanded{\def\jlreq@extramark{\noexpand\jlreq@extramark}}% + \noexpand\markboth{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} +\def\jlreq@clearrightextramarks#1{% + \let\jlreq@extramark@=\jlreq@extramark + \begingroup + \edef\jlreq@tempa{\expandafter\expandafter\expandafter\expandonce\expandafter\expandafter\expandafter{\expandafter\@firstoftwo\@themark}}% + \def\jlreq@extramark##1{\noexpand\jlreq@extramark{\jlreq@cleararguments{#1}{##1}}}% + \protected@edef\jlreq@tempb{\expandafter\@secondoftwo\@themark}% + \edef\jlreq@do{% + \unexpanded{\def\jlreq@extramark{\noexpand\jlreq@extramark}}% + \noexpand\markboth{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} + +\def\jlreq@markboth#1#2{% + \let\jlreq@extramark@=\jlreq@extramark + \def\jlreq@extramark{\noexpand\jlreq@extramark}% + \begingroup + \protected@edef\jlreq@tempa{\expandafter\@firstoftwo\@themark}% + \protected@edef\jlreq@tempa{\unexpanded{#1}\expandafter\jlreq@getextramarkpart\expandafter{\jlreq@tempa}}% + \protected@edef\jlreq@tempb{\expandafter\@secondoftwo\@themark}% + \protected@edef\jlreq@tempb{\unexpanded{#2}\expandafter\jlreq@getextramarkpart\expandafter{\jlreq@tempb}}% + \edef\jlreq@do{% + \noexpand\markboth{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@tempb}}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} +\def\jlreq@markright#1{% + \let\jlreq@extramark@=\jlreq@extramark + \def\jlreq@extramark{\noexpand\jlreq@extramark}% + \begingroup + \protected@edef\jlreq@tempb{\expandafter\@secondoftwo\@themark}% + \protected@edef\jlreq@tempb{\unexpanded{#1}\expandafter\jlreq@getextramarkpart\expandafter{\jlreq@tempb}}% + \edef\jlreq@do{% + \noexpand\markright{\expandonce{\jlreq@tempb}}% + }% + \expandafter\endgroup + \jlreq@do + \let\jlreq@extramark=\jlreq@extramark@ +} + +%.. \DeclarePageStyle内で使うもの +% mark情報の取得を行う． +% #1の中身をみて，#2 = 何段目見出しか，#3 = odd/even，\csname #4@<見出し命令名>\endcsnameに必要情報を追加し，#5の見出し命令名リストに追加 +% #1@heading@levelにレベルを入れる +\def\jlreq@pagestyle@setmark#1#2#3#4#5{% + \begingroup + \expandafter\jlreq@iffirsttoken\expandafter{#1}{_}{% + \ifthenelse{\equal{#3}{odd}}{\let\jlreq@leftright=r}{\let\jlreq@leftright=l}% + \edef\jlreq@do{% + \unexpanded{\def#1}{% + \ifx l\jlreq@leftright + \ifnum#2=0 \noexpand\leftmark\else\unexpanded{\jlreq@extraleftmark{#2}}\fi + \else + \ifnum#2=0 \noexpand\rightmark\else\unexpanded{\jlreq@extrarightmark{#2}}\fi + \fi + }% + }% + \edef\jlreq@headingname{\expandafter\@gobble#1}% 見出し命令名 + \edef\jlreq@tempa{\noexpand\@removeelement{\expandonce{\jlreq@headingname}}}% + \expandafter\jlreq@tempa\expandafter{#5}{#5}% + \@ifundefined{#4@\jlreq@headingname}{\expandafter\def\csname #4@\jlreq@headingname\endcsname{}}{}% + \eappto\jlreq@do{% + \noexpand\let\expandonce{\csname\expandafter\@gobble\string #1@heading@level\endcsname}=\expandonce{\csname jlreq@heading@level@\jlreq@headingname\endcsname}% + \unexpanded{\def#5}{\expandonce{#5},\expandonce{\jlreq@headingname}}% + \noexpand\appto\expandonce{\csname #4@\jlreq@headingname\endcsname}{{{\ifnum#2=0 #3\fi}{#2}{\ifx r\jlreq@leftright r\else l\fi}}}% + }% + }{\def\jlreq@do{}}% + \expandafter\endgroup + \jlreq@do +} + +% \def\<見出し>mark#1{...}というのを\jlreq@resultに入れる， +% #1：*ならばextramarkを使う +% #2: 見出し命令名，#3: mark_format +% #4: {{mark_formatからさらに調べるやつ (odd|even)}{マークの何番目か．extraでない場合は0}{l or r(leftかrightか)}}の並び +\def\jlreq@pagestyle@make@headingmark#1#2#3#4{% + \begingroup + \@for\jlreq@i:=0,1,2\do{% + \expandafter\def\csname jlreq@leftmark@\jlreq@i\endcsname{}% + \expandafter\def\csname jlreq@rightmark@\jlreq@i\endcsname{}% + }% + \jlreq@pagestyle@make@headingmark@{#2}{#3}#4\jlreq@endmark + \def\jlreq@do{}% とりあえず#1markの中身を入れていく + % leftを設定する時は対応するrightを空にする． + \expandafter\ifx\csname jlreq@leftmark@0\endcsname\@empty + \expandafter\ifx\csname jlreq@rightmark@0\endcsname\@empty\else + \eappto\jlreq@do{\jlreq@ifempty{#1}{\noexpand\markright}{\noexpand\jlreq@markright}{\csexpandonce{jlreq@rightmark@0}}}% + \fi + \else + \eappto\jlreq@do{\jlreq@ifempty{#1}{\noexpand\markboth}{\noexpand\jlreq@markboth}{\csexpandonce{jlreq@leftmark@0}}{\csexpandonce{jlreq@rightmark@0}}}% + \fi + \@for\jlreq@i:=1,2\do{% + \expandafter\ifx\csname jlreq@leftmark@\jlreq@i\endcsname\@empty + \expandafter\ifx\csname jlreq@rightmark@\jlreq@i\endcsname\@empty\else + \eappto\jlreq@do{\noexpand\jlreq@setextrarightmark{\jlreq@i}{\csexpandonce{jlreq@rightmark@\jlreq@i}}}% + \fi + \else + \eappto\jlreq@do{% + \noexpand\jlreq@setextraleftmark{\jlreq@i}{\csexpandonce{jlreq@leftmark@\jlreq@i}}% + \noexpand\jlreq@setextrarightmark{\jlreq@i}{\csexpandonce{jlreq@rightmark@\jlreq@i}}% + }% + \fi + }% + \ifx\jlreq@do\@empty\else + \edef\jlreq@do{% + \unexpanded{\edef\jlreq@result}{\noexpand\unexpanded{% + \noexpand\def\expandonce{\csname #2mark\endcsname}\unexpanded{##1}{% + \expandonce{\jlreq@do}% + }}% + }% + }% + \fi + \expandafter\endgroup + \jlreq@do +}% +\def\jlreq@pagestyle@make@headingmark@#1#2#3{% + \jlreq@ifendmark{#3}{}{\jlreq@pagestyle@make@headingmark@@{#1}{#2}#3}% +} + +\def\jlreq@pagestyle@make@headingmark@@#1#2#3#4#5{% + % \jlreq@tempbに\***markの定義を入れる + \edef\jlreq@tempb{\expandonce{\csname the#1\endcsname}\noexpand\quad\unexpanded{##1}}% + \jlreq@parsekeyval@nokey{% + \jlreq@ifempty{##1}{}{\ifthenelse{\equal{##1}{#3}}{\edef\jlreq@tempb{\unexpanded{##2}}}{}}% + \ifthenelse{\equal{##1}{_#1}}{\edef\jlreq@tempb{\unexpanded{##2}}}{}% + }{#2}% + \ifx l#5% + \expandafter\edef\csname jlreq@leftmark@#4\endcsname{\expandonce{\jlreq@tempb}}% + \else + \expandafter\edef\csname jlreq@rightmark@#4\endcsname{\expandonce{\jlreq@tempb}}% + \fi + \jlreq@pagestyle@make@headingmark@{#1}{#2}% +} + +% #2 #3 #4と並んだヘッダを作り#1に入れる．#1，#2，#3はコンロトールシークエンスの名前とする． +\def\jlreq@pagestyle@setheadfoot#1#2#3#4{% + \begingroup + \edef\jlreq@do{\noexpand\jlreq@pagestyle@setheadfoot@{\unexpanded{#1}}{\csexpandonce{#2}}{\csexpandonce{#3}}{\csexpandonce{#4}}}% + \expandafter\endgroup + \jlreq@do +} + +% \edef内だと，#1 != 0ptならば\hskip \dimexpr#1\relaxになる +\def\jlreq@pagestyle@hskip#1{% + \ifdim\dimexpr#1\relax=0pt \expandafter\@gobble\else\expandafter\@firstofone\fi + {\noexpand\hskip\noexpand\dimexpr#1\noexpand\relax}% +} +\def\jlreq@pagestyle@setheadfoot@#1#2#3#4{% + \begingroup + % - \Cdpは端にそろえるための補正 + \jlreq@ifempty{#2}{\def\jlreq@left{}}{\edef\jlreq@left{\jlreq@pagestyle@hskip{\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate - \Cdp\fi}\unexpanded{#2}}}% + % +\topskip - \Chtは\jlreq@headfoot@sidemargin = 0ptの時に本文の右に一致させるための補正． + \jlreq@ifempty{#4}{\def\jlreq@right{}}{\edef\jlreq@right{\unexpanded{#4}\jlreq@pagestyle@hskip{\jlreq@expand@speciallength{\jlreq@headfoot@sidemargin}\if@tate + \topskip - \Cht\fi}}}% + \jlreq@ifempty{#3}{% + \edef\jlreq@do{\unexpanded{\def#1}{\expandonce{\jlreq@left}\hfil\expandonce{\jlreq@right}}}% + \jlreq@ifempty{#2}{\jlreq@ifempty{#4}{\def\jlreq@do{\def#1{}}}{}}{}% + }{% #3を完全に真ん中に配置するために左右の幅を0にしておく + \ifx\jlreq@left\@empty\else\edef\jlreq@left{\noexpand\hbox to 0pt{\expandonce{\jlreq@left}\noexpand\hss}}\fi + \ifx\jlreq@right\@empty\else\edef\jlreq@right{\noexpand\hbox to 0pt{\noexpand\hss\expandonce{\jlreq@right}}}\fi + \edef\jlreq@do{% + \unexpanded{\def#1}{\expandonce{\jlreq@left}\hfil\unexpanded{#3}\hfil\expandonce{\jlreq@right}}% + }% + }% + \expandafter\endgroup + \jlreq@do +}% + +% #1の左右に傍注調整用の空白を入れて#1に代入する +\def\jlreq@pagestyle@addsidenotemargin@left#1{% + \jlreq@pagestyle@addsidenotemargin@{#1}{\marginparwidth+\marginparsep}{}{\marginparwidth+\marginparsep}% +} +\def\jlreq@pagestyle@addsidenotemargin@right#1{ + \jlreq@pagestyle@addsidenotemargin@{#1}{}{\marginparwidth+\marginparsep}{\marginparwidth+\marginparsep}% +} +\def\jlreq@pagestyle@addsidenotemargin@bothside#1{ + \jlreq@pagestyle@addsidenotemargin@{#1}{\marginparwidth+\marginparsep}{\marginparwidth+\marginparsep}{2\marginparwidth+2\marginparsep}% +} +% #2: 左，#3：右，#4：#2 + #3 +\def\jlreq@pagestyle@addsidenotemargin@#1#2#3#4{% + \ifx#1\@empty\else + \edef#1{% + \jlreq@ifempty{#2}{}{\unexpanded{\hskip-\dimexpr #2\relax}}% + \unexpanded{\hbox to \dimexpr\textwidth + #4\relax}{\expandonce{#1}}% + \jlreq@ifempty{#3}{}{\unexpanded{\hskip-\dimexpr #3\relax}}% + }% + \fi +} + +% #1から空かつ#4が空でないならば#2に#3と#4の中身を追加し，#4を空にする．引数は全てコントロールシークエンス +\def\jlreq@pagestyle@addifempty#1#2#3#4{% + \ifx#1\@empty\ifx#4\@empty\else\eappto#2{\expandonce{#3}\expandonce{#4}}\def#4{}\fi\fi +} + +% #1: ターゲットなコントロールシークエンスの名前，#2：*ならばreverseする，#3：空き +% #1に入っている{柱1}{柱2}... という並びから，実際に出力する柱を構築する． +% 間に空白を入れる． +\def\jlreq@pagestyle@make@runninghead#1#2#3{% + \expandafter\ifx\csname #1\endcsname\@empty\expandafter\@gobble\else\expandafter\@firstofone\fi{% + \edef\jlreq@do{% + \noexpand\jlreq@tempbtrue % 最初の処理かフラグ + \unexpanded{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}}\csexpandonce{#1}\noexpand\jlreq@endmark + }% + \expandafter\def\csname #1\endcsname{}% + \jlreq@do + }% +} +\def\jlreq@pagestyle@make@runninghead@#1#2#3#4#5{% + \ifnum\numexpr\jlreq@ifendmark{#5}{1}{0}*\ifjlreq@tempb 1\else 0\fi\relax=1 \expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% + \jlreq@ifempty{#2}{\csappto}{\cspreto}{#1}{#4}% + }{% + \jlreq@ifempty{#2}{\cseappto}{\csepreto}{#1}{% + % 空でない柱が既に出力されたかフラグをたてる + \ifjlreq@tempb\noexpand\jlreq@tempafalse\fi + \unexpanded{\protected@edef\jlreq@tempa{#4}}% + \unexpanded{\ifx\jlreq@tempa\@empty\else}% + \noexpand\ifjlreq@tempa + \jlreq@ifempty{#2}% + {\unexpanded{\hskip\glueexpr #3\relax\jlreq@tempa}}% + {\unexpanded{\jlreq@tempa\hskip\glueexpr #3\relax}}% + \unexpanded{\else + \jlreq@tempa\jlreq@tempatrue + \fi}% + \noexpand\fi + }% + \jlreq@tempbfalse + \jlreq@ifendmark{#5}{}{\jlreq@pagestyle@make@runninghead@{#1}{#2}{#3}{#5}}% + }% +} + +%.. \DeclarePageStyle +\newcommand{\DeclarePageStyle}[2]{% + \expandafter\edef\csname jlreq@pagestyle@setting@#1\endcsname{\unexpanded{#2}}% + \begingroup + \def\jlreq@nombre@i@position{}% + \def\jlreq@nombre@i{\thepage}% + \def\jlreq@running@head@i@position{}% + \def\jlreq@odd@running@head@i{}% + \def\jlreq@even@running@head@i{}% + \def\jlreq@command{}% + \def\jlreq@mark@format{}% + \def\jlreq@font{}% + % 柱とノンブルの間 + \def\jlreq@gap{1.5\zw}% + \def\jlreq@nombre@gap{}% + \def\jlreq@running@head@gap{}% + \newif\ifjlreq@clearmarkcommand\jlreq@clearmarkcommandtrue + \newif\ifjlreq@pstate\jlreq@pstatefalse % PageStyleTATE + \@for\jlreq@i:=ii,iii\do{% + \expandafter\def\csname jlreq@nombre@\jlreq@i @position\endcsname{}% + \expandafter\def\csname jlreq@running@head@\jlreq@i @position\endcsname{}% + \expandafter\def\csname jlreq@nombre@\jlreq@i\endcsname{}% + \expandafter\def\csname jlreq@odd@running@head@\jlreq@i\endcsname{}% + \expandafter\def\csname jlreq@even@running@head@\jlreq@i\endcsname{}% + }% + \jlreq@parsekeyval[PageStyle:#1]{ + *{tate}{\jlreq@pstatetrue} + *{yoko}{\jlreq@pstatefalse} + {nombre}{\def\jlreq@nombre@i{##1}} + {nombre_position}{\def\jlreq@nombre@i@position{##1}} + {running_head_position}{\def\jlreq@running@head@i@position{##1}} + {odd_running_head}{\def\jlreq@odd@running@head@i{##1}} + {even_running_head}{\def\jlreq@even@running@head@i{##1}} + {font}{\def\jlreq@font{##1}} + {mark_format}{\edef\jlreq@mark@format{\unexpanded{##1}}} + {command}{\edef\jlreq@command{\unexpanded{##1}}} + {gap}{\def\jlreq@gap{##1}} + {nombre_gap}{\def\jlreq@nombre@gap{##1}} + {running_head_gap}{\def\jlreq@running@head@gap{##1}} + % trueにすると，\ps@***実行時にまず\***markを全て\@gobbleにする． + {clear_markcommand}[true,false]{\csname jlreq@clearmarkcommand##1\endcsname} + % 二つ目 + {nombre_ii}{\def\jlreq@nombre@ii{##1}} + {nombre_ii_position}{\def\jlreq@nombre@ii@position{##1}} + {running_head_ii_position}{\def\jlreq@running@head@ii@position{##1}} + {odd_running_head_ii}{\def\jlreq@odd@running@head@ii{##1}} + {even_running_head_ii}{\def\jlreq@even@running@head@ii{##1}} + % 三つ目 + {nombre_iii}{\def\jlreq@nombre@iii{##1}} + {nombre_iii_position}{\def\jlreq@nombre@iii@position{##1}} + {running_head_iii_position}{\def\jlreq@running@head@iii@position{##1}} + {odd_running_head_iii}{\def\jlreq@odd@running@head@iii{##1}} + {even_running_head_iii}{\def\jlreq@even@running@head@iii{##1}} + }{#2}% + % ノンブル同士の間や柱同士の間のデフォルトはノンブルと柱の間の空き量 + \ifx\jlreq@nombre@gap\@empty\let\jlreq@nombre@gap=\jlreq@gap\fi + \ifx\jlreq@running@head@gap\@empty\let\jlreq@running@head@gap=\jlreq@gap\fi + % _iiが存在するか調べて\ifjlreq@headii@existに入れる + \newif\ifjlreq@headii@exist + \jlreq@headii@existfalse + \jlreq@for@noexpand\jlreq@tempa:=\jlreq@odd@running@head@ii,\jlreq@odd@running@head@ii\do{% + \expandafter\ifx\jlreq@tempa\@empty\else\jlreq@headii@existtrue\fi + }% + % markの処理 + % (odd|even)_running_head(_ii)が_<見出し命令>で与えられている場合，次のようにする． + % * \jlreq@(odd|even)@running@head(@ii)をマーク出力命令（\(left|right)mark or \jlreq@extra(left|right)mark{}）に書き換える + % - evenの場合はleft，oddの場合はright． + % - @iiがなければ\(left|right)mark，@iiがあれば\jlreq@extra(left|right)mark{1} + % * 例えば_<見出し命令>が_sectionならば，\jlreq@markdata@sectionに{{}{}{}}を追加する．ここで，，は + % - I1: @iiが無いときにodd or even + % - I2: @iiが無ければ0，あれば1． + % - I3: マーク出力命令がleftかrightに応じて l or r．（上述のようにoddかevenかで判定される．） + % * 他にも_sectionが指定されている柱があれば，\jlreq@markdata@sectionにさらに追加で加えていく． + % * \jlreq@(odd|even)@running@head(@ii)@heading@levelに<見出し命令>のレベルを入れる．レベルが不明な時は\relaxになる． + % また，\jlreq@headingmarklistに<見出し命令>の一覧を入れる． + \def\jlreq@headingmarklist{}% + \@for\jlreq@parity:=odd,even\do{% + \@for\jlreq@i:=0,1,2\do{% + % \jlreq@pagestyle@setmarkが上の処理を行う． + \edef\jlreq@next{\noexpand\jlreq@pagestyle@setmark{\expandonce{\csname jlreq@\jlreq@parity @running@head@\@roman\numexpr\jlreq@i + 1\relax\endcsname}}{\expandonce{\jlreq@i}}{\expandonce{\jlreq@parity}}{jlreq@markdata}{\noexpand\jlreq@headingmarklist}}% + \jlreq@next + }% + }% + % \jlreq@minimumlevelに見出しの最低レベルを入れる． + \let\jlreq@minimumlevel=\@undefined + \def\jlreq@markdefinecommand{}% + \@for\jlreq@heading:=\jlreq@headingmarklist\do{% + \ifx\jlreq@heading\@empty\else + \expandafter\let\expandafter\jlreq@level\csname jlreq@heading@level@\jlreq@heading\endcsname + \ifx\jlreq@level\relax\else + \ifx\jlreq@minimumlevel\@undefined\let\jlreq@minimumlevel=\jlreq@level + \else\ifnum\jlreq@minimumlevel>\jlreq@level\space\let\jlreq@minimumlevel=\jlreq@level\fi\fi + \fi + % \jlreq@markdata@<見出し命令>にある情報とmark_formatをもとに，\<見出し命令>markを定義するマクロを作成，\jlreq@markdefinecommandに入れる． + \edef\jlreq@next{\noexpand\jlreq@pagestyle@make@headingmark{\ifjlreq@headii@exist *\fi}{\expandonce{\jlreq@heading}}{\expandonce{\jlreq@mark@format}}{\csexpandonce{jlreq@markdata@\jlreq@heading}}}% + \jlreq@next + \eappto\jlreq@markdefinecommand{\expandonce{\jlreq@result}}% + \fi + }% + \ifx\jlreq@minimumlevel\@undefined\else + \eappto\jlreq@markdefinecommand{\noexpand\jlreq@pagestyle@setclearmark{\expandonce{\jlreq@minimumlevel}}}% + \fi + % 見出しを出す場合：evenに章などの高いレベルの見出しを出す（2.6.3.a） + \@ifundefined{jlreq@odd@running@head@i@heading@level}{}{\@ifundefined{jlreq@even@running@head@i@heading@level}{}{% + \ifnum\jlreq@odd@running@head@i@heading@level<\jlreq@even@running@head@i@heading@level + \jlreq@note{偶数ページには奇数ページよりアウトラインレベルの高い見出しを入れる (ページスタイル #1内，2.6.3.a)．}% + \fi + }}% + % \jlreq@oddhead,\jlreq@oddfoot,\jlreq@evenhead,\jlreq@evenfootに必要なものを入れる． + \ifjlreq@pstate\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% tate + % headの方に処理を入れる．footは空． + \def\jlreq@oddfoot{}\def\jlreq@evenfoot{}% + \jlreq@for@noexpand\jlreq@position:=\jlreq@nombre@i@position,\jlreq@running@head@i@position\do{% + \expandafter\ifx\jlreq@position\@empty\expandafter\def\jlreq@position{0pt}\fi + }% + \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq@nombre@gap}\noexpand\relax}% + \jlreq@pagestyle@addifempty{\jlreq@nombre@iii@position}{\jlreq@nombre@ii}{\jlreq@gapcs}{\jlreq@nombre@iii}% + \jlreq@pagestyle@addifempty{\jlreq@nombre@ii@position}{\jlreq@nombre@i}{\jlreq@gapcs}{\jlreq@nombre@ii}% + \edef\jlreq@gapcs{\noexpand\hskip\noexpand\glueexpr\expandonce{\jlreq@running@head@gap}\noexpand\relax}% + \jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@odd@running@head@ii}{\jlreq@gapcs}{\jlreq@odd@running@head@iii}% + \jlreq@pagestyle@addifempty{\jlreq@running@head@ii@position}{\jlreq@odd@running@head@i}{\jlreq@gapcs}{\jlreq@odd@running@head@ii}% + \jlreq@pagestyle@addifempty{\jlreq@running@head@iii@position}{\jlreq@even@running@head@ii}{\jlreq@gapcs}{\jlreq@even@running@head@iii}% + \jlreq@pagestyle@addifempty{\jlreq@running@head@ii@position}{\jlreq@even@running@head@i}{\jlreq@gapcs}{\jlreq@even@running@head@ii}% + \def\jlreq@nombre@contents{}% ノンブルを入れる（下の方に出力） + \@for\jlreq@i:=i,ii,iii\do{% + \expandafter\let\expandafter\jlreq@position\csname jlreq@nombre@\jlreq@i @position\endcsname + \expandafter\ifx\csname jlreq@nombre@\jlreq@i\endcsname\@empty\else + \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}% + \eappto\jlreq@nombre@contents{% + \noexpand\hbox to 0pt{\hss + \ifx\jlreq@position\@empty\else\unexpanded{\hskip \glueexpr}\expandonce{\jlreq@position}\noexpand\relax\fi + \csexpandonce{jlreq@nombre@\jlreq@i}% + }% + }% + \fi + }% + % \jlreq@(odd|even)@contentsに柱を入れる（上の方に出力） + \@for\jlreq@parity:=odd,even\do{% + \expandafter\def\csname jlreq@\jlreq@parity @contents\endcsname{}% + \@for\jlreq@i:=i,ii,iii\do{% + \expandafter\let\expandafter\jlreq@position\csname jlreq@running@head@\jlreq@i @position\endcsname + \expandafter\ifx\csname jlreq@\jlreq@parity @running@head@\jlreq@i\endcsname\@empty\else + \jlreq@ifgluezero{\glueexpr\jlreq@position\relax}{\def\jlreq@position{}}{}% + \expandafter\eappto\csname jlreq@\jlreq@parity @contents\endcsname{% + \noexpand\hbox to 0pt{\unexpanded{\hskip\glueexpr\headsep + \headheight}% + \if@tate\else\unexpanded{+ \topskip - \Cht}\fi + \ifx\jlreq@position\@empty\else + \expandonce{\jlreq@position}\fi\noexpand\relax + \csexpandonce{jlreq@\jlreq@parity @running@head@\jlreq@i}\hss + }% + }% + \fi + }% + % \jlreq@(odd|even)headの構築 + \expandafter\edef\csname jlreq@\jlreq@parity head\endcsname{% + \unexpanded{\setbox\jlreq@tempboxa=\hbox to \dimexpr\headsep + \headheight + \textheight}\if@tate\else\unexpanded{- \topskip + 1\zh}\fi\noexpand\relax + {% + \unexpanded{\tate\adjustbaseline}% + \csexpandonce{jlreq@\jlreq@parity @contents}% + \noexpand\hfil + \expandonce{\jlreq@nombre@contents}% + }% + % Underful対策 + \ifx l\jlreq@engine + \unexpanded{\wd\jlreq@tempboxa=\headheight}% + \else + \unexpanded{\ht\jlreq@tempboxa=\headheight\dp\jlreq@tempboxa=0pt}% + \fi + }% + }% + % \jlreq@tempboxaに入っているボックスを正しく配置する + \edef\jlreq@lefthead@adjustbox{% + \noexpand\hskip\noexpand\dimexpr\if@tate\unexpanded{- \Cdp}\fi - \unexpanded{\headsep - 1\zw\relax}% + \unexpanded{\box\jlreq@tempboxa\hfil}% + }% + \edef\jlreq@righthead@adjustbox{% + \noexpand\hskip\unexpanded{\dimexpr\textwidth}\if@tate\unexpanded{- \topskip + \Cht}\fi\unexpanded{ + \headsep\relax}% + \unexpanded{\box\jlreq@tempboxa\hss}% + }% + \if@tate + \eappto\jlreq@oddhead{\expandonce{\jlreq@lefthead@adjustbox}}% + \eappto\jlreq@evenhead{\expandonce{\jlreq@righthead@adjustbox}}% + \else + \eappto\jlreq@oddhead{\expandonce{\jlreq@righthead@adjustbox}}% + \eappto\jlreq@evenhead{\expandonce{\jlreq@lefthead@adjustbox}}% + \fi + }{% yoko + % 場所を正規化する． + \def\jlreq@nombre@i@position@default{{bottom}{center}}% + \def\jlreq@running@head@i@position@default{{top}{center}}% + % iiの位置は指定されていない場合はiのそれに合わせる + \@for\jlreq@tempa:=jlreq@nombre,jlreq@running@head\do{% + \@for\jlreq@i:=ii,iii\do{% + \expandafter\ifx\csname\jlreq@tempa @\jlreq@i @position\endcsname\@empty + \expandafter\let\csname\jlreq@tempa @\jlreq@i @position\expandafter\endcsname\csname\jlreq@tempa @i@position\endcsname + \fi + \expandafter\edef\csname\jlreq@tempa @\jlreq@i @position@default\endcsname{\csname\jlreq@tempa @i@position@default\endcsname}% + }% + }% + \@for\jlreq@tempa:=jlreq@nombre@i@position,jlreq@nombre@ii@position,jlreq@nombre@iii@position,jlreq@running@head@i@position,jlreq@running@head@ii@position,jlreq@running@head@iii@position\do{% + \edef\jlreq@next{\noexpand\jlreq@pagestyle@parse@position{\csexpandonce{\jlreq@tempa}}{\expandonce{\csname\jlreq@tempa\endcsname}}{\csexpandonce{\jlreq@tempa @default}}}% + \jlreq@next + }% + \ifthenelse{\( + \boolean{@tate} \AND \( + \equal{\expandafter\@secondoftwo\jlreq@nombre@i@position}{right} \OR + \equal{\expandafter\@secondoftwo\jlreq@running@head@i@position}{right} + \)\) \OR \( + \(\NOT \boolean{@tate}\) \AND \( + \equal{\expandafter\@secondoftwo\jlreq@nombre@i@position}{left} \OR + \equal{\expandafter\@secondoftwo\jlreq@running@head@i@position}{left} + \) + \)}{% + \if@twoside + \jlreq@note{柱やノンブルは，左ページでは，基本版面の左端の延長線にノンブル又は柱の先頭をそろえて配置するか，基本版面の左端の延長線から基本版面の文字サイズの全角アキだけ右に寄せた位置に配置する (ページスタイル #1 内，2.6.1.b)．}% + \fi + }{}% + {\jlreq@font + \ifthenelse{\lengthtest{\jlreq@gap < 1.49\zw} \OR \( \lengthtest{\jlreq@gap > 1.51\zw} \AND \lengthtest{\jlreq@gap < 1.99\zw} \) \OR \lengthtest{\jlreq@gap > 2.01\zw}}{\jlreq@note{ノンブルと柱との空き量は文字サイズの2倍又は1.5倍とする (ページスタイル #1 内，2.6.1.c)．}}{}% + }% + % 初期化 + \@for\jlreq@parity:=odd,even\do{% + \@for\jlreq@vert:=top,bottom\do{% + \@for\jlreq@hor:=left,center,right\do{% + \@for\jlreq@type:=nombre,running@head\do{% + \expandafter\def\csname jlreq@\jlreq@type @\jlreq@parity @\jlreq@vert @\jlreq@hor\endcsname{}% + }% + }% + }% + % ページが左か右か + \jlreq@ifleftpage{\jlreq@parity}{\def\jlreq@pagehor{left}}{\def\jlreq@pagehor{right}}% + % \jlreq@(running@head|nombre)@(odd|even)@(top|bottom)@(left|center|right)に入れていく + % 左ページではノンブルが左（2.6.1.c），i,ii,...はiが左になるようにする． + \@for\jlreq@i:=i,ii,iii\do{% + % nombre + \expandafter\ifx\csname jlreq@nombre@\jlreq@i\endcsname\@empty\else + \edef\jlreq@position{\csname jlreq@nombre@\jlreq@i @position\endcsname}% + \edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}% + \edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}% + \ifthenelse{\equal{\jlreq@parity}{even}}{\jlreq@reverse@leftright{\jlreq@hor}}{}% + \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs\csepreto}% + \edef\jlreq@csname{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}% + \expandafter\ifx\csname\jlreq@csname\endcsname\@empty\else\jlreq@addtocs{\jlreq@csname}{\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@nombre@gap}\noexpand\relax}\fi + \jlreq@addtocs{\jlreq@csname}{\csexpandonce{jlreq@nombre@\jlreq@i}}% + \fi + % running@head + % 一度「紙面の外から」の順番で{A}{B}{C}と入れる + \expandafter\ifx\csname jlreq@\jlreq@parity @running@head@\jlreq@i \endcsname\@empty\else + \edef\jlreq@position{\csname jlreq@running@head@\jlreq@i @position\endcsname}% + \edef\jlreq@vert{\expandafter\@firstoftwo\jlreq@position}% + \edef\jlreq@hor{\expandafter\@secondoftwo\jlreq@position}% + \ifthenelse{\equal{\jlreq@parity}{even}}{\jlreq@reverse@leftright{\jlreq@hor}}{}% + \ifthenelse{\equal{\jlreq@hor}{\jlreq@pagehor}}{\let\jlreq@addtocs=\eappto}{\let\jlreq@addtocs=\epreto}% + \expandafter\jlreq@addtocs\csname jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor\endcsname{{\csexpandonce{jlreq@\jlreq@parity @running@head@\jlreq@i}}}% + \fi + }% + \@for\jlreq@vert:=top,bottom\do{% + \@for\jlreq@hor:=left,center,right\do{% + \ifthenelse{\equal{\jlreq@hor}{right}}{\def\jlreq@tempa{*}}{\def\jlreq@tempa{}}% + \edef\jlreq@do{\noexpand\jlreq@pagestyle@make@runninghead{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}{\expandonce{\jlreq@tempa}}{\expandonce{\jlreq@running@head@gap}}}% + \jlreq@do + }% + }% + % ノンブルと柱を結合し，必要ならばフォント設定をする． + \@for\jlreq@vert:=top,bottom\do{% + \@for\jlreq@hor:=left,center,right\do{% + \edef\jlreq@csname{jlreq@\jlreq@parity @\jlreq@vert @\jlreq@hor}% + \edef\jlreq@runheadcsname{jlreq@running@head@\jlreq@parity @\jlreq@vert @\jlreq@hor}% + \edef\jlreq@nombrecsname{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}% + \ifnum 0\expandafter\ifx\csname\jlreq@runheadcsname\endcsname\@empty 1\fi\expandafter\ifx\csname\jlreq@nombrecsname\endcsname\@empty 1\fi>0 + \expandafter\edef\csname\jlreq@csname\endcsname{\csexpandonce{\jlreq@runheadcsname}\csexpandonce{\jlreq@nombrecsname}}% + \else + \jlreq@ifleftpage{\jlreq@parity}{\let\jlreq@addtocs=\cseappto}{\let\jlreq@addtocs=\csepreto}% + % 柱＋空きを\jlreq@tempaに入れる + \def\jlreq@tempa{}% + \ifthenelse{\equal{\jlreq@pagehor}{\jlreq@hor}}{% + \jlreq@addtocs{jlreq@tempa}{\unexpanded{\hskip\glueexpr}\expandonce{\jlreq@gap}\noexpand\relax}% + \jlreq@addtocs{jlreq@tempa}{\csexpandonce{\jlreq@runheadcsname}}% + }{% + % 柱が空ならば柱とノンブルの空きを入れない． + \jlreq@addtocs{jlreq@tempa}{\unexpanded{\ifdim\wd\jlreq@tempboxa=0pt \else\hskip\glueexpr}\expandonce{\jlreq@gap}\unexpanded{\relax\fi}}% + \jlreq@addtocs{jlreq@tempa}{\copy\jlreq@tempboxa}% + \epreto\jlreq@tempa{\unexpanded{\setbox\jlreq@tempboxa=\hbox}{\csexpandonce{\jlreq@runheadcsname}}}% + }% + \expandafter\edef\csname\jlreq@csname\endcsname{\csexpandonce{jlreq@nombre@\jlreq@parity @\jlreq@vert @\jlreq@hor}}% + \jlreq@addtocs{\jlreq@csname}{\expandonce{\jlreq@tempa}}% + \fi + \ifx\jlreq@font\@empty\else\expandafter\ifx\csname\jlreq@csname\endcsname\@empty\else + \expandafter\edef\csname\jlreq@csname\endcsname{{\expandonce{\jlreq@font}\csexpandonce{\jlreq@csname}}}% + \fi\fi + }% + }% + }% + % 四カ所構築 + \jlreq@pagestyle@setheadfoot{\jlreq@oddhead}{jlreq@odd@top@left}{jlreq@odd@top@center}{jlreq@odd@top@right}% + \jlreq@pagestyle@setheadfoot{\jlreq@oddfoot}{jlreq@odd@bottom@left}{jlreq@odd@bottom@center}{jlreq@odd@bottom@right}% + \jlreq@pagestyle@setheadfoot{\jlreq@evenhead}{jlreq@even@top@left}{jlreq@even@top@center}{jlreq@even@top@right}% + \jlreq@pagestyle@setheadfoot{\jlreq@evenfoot}{jlreq@even@bottom@left}{jlreq@even@bottom@center}{jlreq@even@bottom@right}% + % 傍注用調整 + \ifdim\marginparwidth>0pt + \if@tate\else + \if@twocolumn + \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@oddhead}% + \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@oddfoot}% + \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@evenhead}% + \jlreq@pagestyle@addsidenotemargin@bothside{\jlreq@evenfoot}% + \else + \jlreq@pagestyle@addsidenotemargin@right{\jlreq@oddhead}% + \jlreq@pagestyle@addsidenotemargin@right{\jlreq@oddfoot}% + \jlreq@pagestyle@addsidenotemargin@left{\jlreq@evenhead}% + \jlreq@pagestyle@addsidenotemargin@left{\jlreq@evenfoot}% + \fi + \fi + \fi + }% + \edef\jlreq@do{% + \noexpand\edef\expandonce{\csname ps@#1\endcsname}{% + \noexpand\unexpanded{% + \unexpanded{\def\jlreq@current@pagestyle{#1}}% + \ifjlreq@clearmarkcommand\unexpanded{\jlreq@heading@execmacro@toallheadings\jlreq@clearheadingmarks}\fi + \ifjlreq@headii@exist + \unexpanded{\let\@mkboth=\jlreq@markboth}% + \else + \unexpanded{\let\@mkboth=\markboth}% + \fi + \unexpanded{\def\@oddhead}{\expandonce{\jlreq@oddhead}}% + \unexpanded{\def\@oddfoot}{\expandonce{\jlreq@oddfoot}}% + \unexpanded{\def\@evenhead}{\expandonce{\jlreq@evenhead}}% + \unexpanded{\def\@evenfoot}{\expandonce{\jlreq@evenfoot}}% + \expandonce{\jlreq@markdefinecommand}% + \expandonce{\jlreq@command}% + }% + }% + }% + \expandafter\endgroup + \jlreq@do +} + +\newcommand*{\NewPageStyle}[2]{% + \expandafter\@ifdefinable\csname ps@#1\endcsname{\DeclarePageStyle{#1}{#2}}% +} +\newcommand*{\RenewPageStyle}[2]{% + \@ifundefined{ps@#1}{\@latex@error{\expandafter\string\csname#1\endcsname\space undefined}\@ehc}{\DeclarePageStyle{#1}{#2}}% +} +\newcommand*{\ProvidePageStyle}[2]{% + \@ifundefined{ps@#1}{\DeclarePageStyle{#1}{#2}}{}% +} +\newcommand*{\ModifyPageStyle}[2]{% + \begingroup + \@ifundefined{jlreq@pagestyle@setting@#1}{\ClassError{jlreq}{Unknown pagestyle: #1}{\@ehc}}{}% + \expandafter\let\expandafter\setting\expandafter=\csname jlreq@pagestyle@setting@#1\endcsname + \edef\jlreq@do{\noexpand\RenewPageStyle{#1}{\expandonce{\setting},\unexpanded{#2}}}% + \expandafter\endgroup + \jlreq@do +} + +%.. 各種定義 +\RenewPageStyle{empty}{nombre={},odd_running_head={},even_running_head={}} +\ifthenelse{\equal{\jlreq@article@type}{article}}{ + \if@twoside + \NewPageStyle{headings}{odd_running_head={_subsection},even_running_head={_section}} + \else + \NewPageStyle{headings}{odd_running_head={_section},even_running_head={}} + \fi +}{% book, article + \if@twoside + \NewPageStyle{headings}{odd_running_head={_section},even_running_head={_chapter}} + \else + \NewPageStyle{headings}{odd_running_head={_chapter},even_running_head={}} + \fi + \ModifyPageStyle{headings}{mark_format={_chapter={第\thechapter 章\quad #1}}} +} +\if@tate + \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},clear_markcommand=false} + \NewPageStyle{myheadings}{nombre=\thepage,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false} + \if@twoside + \ModifyPageStyle{plain}{nombre_position={top-left}} + \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-left,running_head_position=top-left} + \ModifyPageStyle{myheadings}{nombre_position=bottom-left,running_head_position=top-left} + \else + \ModifyPageStyle{plain}{nombre_position={top-center}} + \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center} + \ModifyPageStyle{myheadings}{nombre_position=bottom-center,running_head_position=top-center} + \fi +\else% yoko + \RenewPageStyle{plain}{nombre=\thepage,odd_running_head={},even_running_head={},nombre_position={bottom-center},clear_markcommand=false} + \ModifyPageStyle{headings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center} + \NewPageStyle{myheadings}{nombre=\thepage,nombre_position=bottom-center,running_head_position=top-center,odd_running_head=\rightmark,even_running_head=\leftmark,clear_markcommand=false} +\fi +\ModifyPageStyle{plain}{font=\small} +\ModifyPageStyle{headings}{font=\small} +\ModifyPageStyle{myheadings}{font=\small} + +%. フロート関連 +% 4.3.3.dの例，縦組みの時だけど横にも適用…… +\setlength{\floatsep}{1\jlreq@gol plus 1\jlreq@gol} +\setlength{\textfloatsep}{1\jlreq@gol plus \baselineskip} +\intextsep=\textfloatsep +\dblfloatsep=\floatsep +\dbltextfloatsep=\textfloatsep +% 残りはデフォルトにしておく． + +% 4.3.1 注4 +\newlength\abovecaptionskip +\newlength\belowcaptionskip +\newcommand{\@makecaption}[2]{{% + \reset@font\small + \vskip\abovecaptionskip + \edef\jlreq@do{\unexpanded{\def\jlreq@tempa##1}{\expandonce{\jlreq@makecaption@label@format}}}% + \jlreq@do + \jlreq@ifempty{#1}{}{% + \edef\jlreq@tempa{{\noexpand\jlreq@@makecaption@label@font\expandonce{\jlreq@tempa{#1}}\unexpanded{\hskip \glueexpr\jlreq@makecaption@after@label@space\relax}}}% + }% + \appto\jlreq@tempa{{\jlreq@@makecaption@font #2}}% + \setbox\@tempboxa=\hbox{\jlreq@tempa}% + \@ifundefined{@currenvir}{% + \@ifundefined{@captype}% + {\def\jlreq@tempb{}}% + {\let\jlreq@tempb=\@captype}% + }{\let\jlreq@tempb=\@currenvir}% + \@ifundefined{jlreq@caption@align@\jlreq@tempb}% + {\let\jlreq@align=\jlreq@caption@align}% + {\expandafter\let\expandafter\jlreq@align\csname jlreq@caption@align@\jlreq@tempb\endcsname}% + \ifdim\wd\@tempboxa>\hsize\relax + {% + \ifx c\jlreq@align\centering\fi + \ifx r\jlreq@align\raggedleft\fi + \jlreq@tempa\par + }% + \else + \global\@minipagefalse + \hbox to\hsize{% + \ifnum0\ifx c\jlreq@align 1\fi\ifx r\jlreq@align 1\fi>0 \hfil\fi + \unhbox\@tempboxa + \ifnum0\ifx c\jlreq@align 1\fi\ifx l\jlreq@align 1\fi>0 \hfil\fi + }% + \fi + \vskip\belowcaptionskip}} +\jlreq@jlreqsetup@add{caption_font}{\def\jlreq@@makecaption@font{#1}} +\jlreq@jlreqsetup@add{caption_label_font}{\def\jlreq@@makecaption@label@font{#1}} +\jlreq@jlreqsetup@add{caption_label_format}{\edef\jlreq@makecaption@label@format{\unexpanded{#1}}} +\jlreq@jlreqsetup@add{caption_after_label_space}{\def\jlreq@makecaption@after@label@space{#1}} +\def\jlreq@caption@setalign#1#2{% + \jlreq@switch{#2}{ + {center}{\let#1=c} + {left}{\let#1=l} + {right}{\let#1=r} + {top}{\let#1=l} + {bottom}{\let#1=r} + }% +} +\jlreq@jlreqsetup@add{caption_align}{% + \jlreq@parsekeyval@nokey{% + \jlreq@ifempty{##1}{}{% + \jlreq@switch{##1}{% + {center}{\let\jlreq@caption@align=c} + {left}{\let\jlreq@caption@align=l} + {right}{\let\jlreq@caption@align=r} + {top}{\let\jlreq@caption@align=l} + {bottom}{\let\jlreq@caption@align=r} + {\expandafter\jlreq@caption@setalign\csname jlreq@caption@align@##1\endcsname{##2}} + }% + }% + }{#1}% +} +\jlreqsetup{caption_font={\sffamily\bfseries},caption_label_font={\sffamily\bfseries},caption_after_label_space=1\zw,caption_label_format={#1},caption_align=center} +% 特に根拠のない値 +\setlength\abovecaptionskip{.5\jlreq@gol} +\setlength\belowcaptionskip{0pt} + +%.. figure環境 +\newcounter{figure} +\ifthenelse{\equal{\jlreq@article@type}{article}}{% + \renewcommand{\thefigure}{\@arabic\c@figure} +}{% + \@addtoreset{figure}{chapter} + \renewcommand{\thefigure}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@figure} +} +\newcommand*{\fps@figure}{h} +\newcommand*{\ftype@figure}{1} +\newcommand*{\ext@figure}{lof} +\newcommand*{\fnum@figure}{\figurename\thefigure} +\newenvironment{figure}{\@float{figure}}{\end@float} +\newenvironment{figure*}{\@dblfloat{figure}}{\end@dblfloat} +\newcommand*{\listfigurename}{図目次} +\newcommand{\figurename}{図} + +%.. table環境 +\newcounter{table} +\ifthenelse{\equal{\jlreq@article@type}{article}}{% + \renewcommand{\thetable}{\@arabic\c@table} +}{% + \@addtoreset{table}{chapter} + \renewcommand{\thetable}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@table} +} +\newcommand*{\fps@table}{h} +\newcommand*{\ftype@table}{2} +\newcommand*{\ext@table}{lot} +\newcommand*{\fnum@table}{\tablename\thetable} +\newenvironment{table}{\@float{table}}{\end@float} +\newenvironment{table*}{\@dblfloat{table}}{\end@dblfloat} +\newcommand{\listtablename}{表目次} +\newcommand{\tablename}{表} + +%. タイトル周り +\newenvironment{titlepage}{% + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse\newpage + \fi + \thispagestyle{empty}% + \setcounter{page}{1}% +}{% + \if@restonecol\twocolumn\else\newpage\fi + \if@twoside\else + \setcounter{page}{1}% + \fi +} + +\if@titlepage + \newcommand{\maketitle}{% + % jarticleとかからあまり変更していない + \begin{titlepage}% + \let\footnotesize\small + \let\footnoterule\relax + \let\footnote\thanks + \null\vfil + \vskip 4\baselineskip + \begin{center}% + {\LARGE \@title \par}% + \vskip\baselineskip% + {\Large + \lineskip .75em% + % 縦書き時には表組み内でも縦書きにするようにする + \if@tate + \let\jlreq@temporary@original@ialign=\ialign + \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}% + \fi + \begin{tabular}[t]{c}% + \@author + \end{tabular}\par}% + \vskip\baselineskip + {\large\@date\par}% + \end{center}\par + \vfil{\centering\@thanks}\vfil\null + \end{titlepage}% + \jlreq@endofmaketitle + } +\else + \newcommand{\maketitle}{% + \par + \begingroup + \renewcommand{\thefootnote}{\fnsymbol{footnote}}% + \renewcommand{\@makefnmark}{\hbox{% + \jlreq@iftdir{\yoko}{}% + \rlap{\@textsuperscript{\normalfont\@thefnmark}}% + }}% + \renewcommand{\jlreq@referencemark@format}[1]{\@makefnmark}% うーん + \if@twocolumn + \ifnum\col@number=\@ne + \@maketitle + \else + \twocolumn[\@maketitle]% + \fi + \else + \newpage + \global\@topnum\z@ + \@maketitle + \fi + % \pagestyle{empty}の時はそのまま． + \ifnum0\ifx\@oddhead\@empty\else1\fi\ifx\@evenhead\@empty\else1\fi>0 + \thispagestyle{plain}% + \fi + \@thanks + \endgroup + \jlreq@endofmaketitle + } +\fi +% いろいろクリアする． +\def\jlreq@endofmaketitle{% + \setcounter{footnote}{0}% + \global\let\thanks\relax + \global\let\maketitle\relax + \global\let\p@thanks\relax + \global\let\@thanks\@empty + \global\let\@author\@empty + \global\let\@date\@empty + \global\let\@title\@empty + \global\let\title\relax + \global\let\author\relax + \global\let\date\relax + \global\let\and\relax +}% +% \vskipを\baselineskipにしてみた． +\def\@maketitle{% + \newpage\null + \vskip 2\baselineskip% + \begin{center}% + {\jlreq@keepbaselineskip{\LARGE}\@title\par}% + \vskip\baselineskip + {\jlreq@keepbaselineskip{\large}% + \lineskip .5\zh + % 縦書き時には表組み内でも縦書きにするようにする + \if@tate + \let\jlreq@temporary@original@ialign=\ialign + \pretocmd{\ialign}{\unexpanded{\tate\let\ialign=\jlreq@temporary@original@ialign}}{}{}% + \fi + \begin{tabular}[t]{c}% + \@author + \end{tabular}% + \par + }% + \ifx\@date\@empty\else + \vskip\baselineskip + {\jlreq@keepbaselineskip{\large}\@date}% + \fi + \end{center}% + \par + \vskip\baselineskip + \ifvoid\jlreq@abstractbox\else\unvbox\jlreq@abstractbox\fi +} + +%.. abstract +\def\jlreq@parhook@abstract{} +\ifthenelse{\equal{\jlreq@article@type}{book}}{}{% article,report + \newbox\jlreq@abstractbox + \newcommand*{\abstractname}{概要} + \if@titlepage + % articleとかjarticleとかと同じ + \newenvironment{abstract}{% + \titlepage + \null\vfil + \@beginparpenalty\@lowpenalty + \begin{center}% + {\sffamily\bfseries\abstractname}% + \@endparpenalty\@M + \end{center}% + \par + }{% + \par\vfil\null\endtitlepage + } + \else + \newenvironment{abstract}{% + \ifnum0\if@twocolumn\else1\fi\ifjlreq@preamble1\fi>0 + \ifjlreq@preamble + \ifx l\jlreq@engine\else + \def\jlreq@parhook@abstract{\futurelet\jlreq@nextchar\jlreq@openbracket@hook}% + \PushPostHook{par}{\jlreq@parhook@abstract}% + \fi + \fi + % とりあえず全部ボックスに入れる． + \global\setbox\jlreq@abstractbox=\vtop\bgroup + \ifjlreq@preamble + % preamble後っぽく振る舞う + \@noskipsecfalse + % \@nodocumentが入っているので一時的に無効化 + \everypar{}% + \fi + \if@twocolumn + \parindent=0pt + \hsize=\textwidth + % 後で\@maketitleとともに呼び出されるときは\twcolumn[***]で呼び出される． + \begin{minipage}[b]{\textwidth}% + \fi + \bgroup + \small + \parindent=1\zw + \begin{center}% + {\sffamily\bfseries\abstractname}% + \end{center}% + \list{}{% + \listparindent\parindent + \itemindent\listparindent + \labelwidth\z@ + \labelsep\z@ + \leftmargin=2\zw + \rightmargin\leftmargin + \@tempdima=1\zw + \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax + \@tempdimc=\@tempdimb + \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima + \ifdim\@tempdimb=\@tempdimc\else\@tempdimb=\dimexpr\@tempdimb - 1\zw\relax\fi + \leftmargin=\dimexpr\leftmargin + (\@tempdimc - \@tempdimb)/2\relax + \rightmargin=\dimexpr\rightmargin + (\@tempdimc - \@tempdimb)/2\relax + \parsep\z@ \@plus.1\zh + }% + \item\relax + \else + \section*{\abstractname}% + \fi + }{% + \ifnum0\if@twocolumn\else1\fi\ifjlreq@preamble1\fi>0 + \endlist + \egroup + \vspace{\baselineskip}% + \if@twocolumn + \end{minipage} + \fi + \egroup + \fi + \ifjlreq@preamble + \ifx l\jlreq@engine\else + \def\jlreq@parhook@abstract{}% + \fi + \else + \unvbox\jlreq@abstractbox + \fi + } + \fi +} +%. 箇条書き．cf. JISX4051 8.4 +% 用語定義型 +\newenvironment{description}{\list{}{% + \setlength{\leftmargin}{0\zw}% 下げない + \setlength{\labelwidth}{0\zw}% + \setlength{\labelsep}{1\zw} +% \addtolength{\leftmargin}{\leftskip}% たぶんこの二行いらない…… +% \addtolength{\leftmargin}{\labelsep}% + \let\makelabel=\descriptionlabel +% 同行じゃない場合はこんな感じ？ +% \let\jlreq@original@@item=\@item +% \def\@item[##1]{\jlreq@original@@item[##1]\mbox{}\par + }}{\endlist} +\newcommand{\descriptionlabel}[1]{\normalfont\sffamily\bfseries #1} + +% enumerateとitemize +% 見出しが一つ上のレベルからどのくらいずれているかを入れる． +% （見出しは2\zwの箱に右/下詰めで入る．） +\setlength\leftmargini{2\zw} +\setlength\leftmarginii{1\zw} +\setlength\leftmarginiii{1\zw} +\setlength\leftmarginiv{1\zw} +\setlength\leftmarginv{1\zw} +\setlength\leftmarginvi{1\zw} + +%.. 箇条書き +\jlreq@jlreqsetup@add{itemization_beforeafter_space}{ + \begingroup + \def\jlreq@do{}% + \def\jlreq@keyvallist{}% + \@for\@tempa:=#1\do{% + \expandafter\jlreq@remove@spaceandbracket\expandafter{\@tempa}{\@tempa}% + \expandafter\jlreq@ifcontains\expandafter{\@tempa}{=}{% + \expandafter\appto\expandafter\jlreq@keyvallist\expandafter{\@tempa,}% + }{% + \@for\@tempb:=i,ii,iii,iv,v,vi\do{% + \eappto\jlreq@do{\noexpand\def\expandonce{\csname jlreq@itemization@beforeafter@space@\@tempb\endcsname}{\expandonce{\@tempa}}}% + }% + }% + }% + \def\jlreq@tempa{% + \jlreq@parsekeyval{% + {i}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@i{####1}}} + {ii}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@ii{####1}}} + {iii}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@iii{####1}}} + {iv}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@iv{####1}}} + {v}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@v{####1}}} + {vi}{\appto\jlreq@do{\def\jlreq@itemization@beforeafter@space@vi{####1}}} + }% + }% + \expandafter\jlreq@tempa\expandafter{\jlreq@keyvallist}% + \expandafter\endgroup + \jlreq@do +} +\jlreq@jlreqsetup@add{itemization_itemsep}{\def\jlreq@itemization@itemsep{#1}} +\jlreqsetup{itemization_beforeafter_space={0pt,i=.5\baselineskip},itemization_itemsep=0pt} +% enumerate, itemize用初期化 +\def\jlreq@init@list{% + \setlength{\labelwidth}{2\zw}% + \setlength{\partopsep}{0pt}% + \setlength{\itemsep}{\dimexpr\jlreq@itemization@itemsep\relax}% + \setlength{\parsep}{0pt}% + \setlength{\listparindent}{\parindent}% +% itemizeは直後ベタ，enumerateは直後全角空き． + \ifthenelse{\equal{\@currenvir}{itemize}}{% + \setlength{\labelsep}{0\zw}% + }{% + \setlength{\labelsep}{1\zw}% + }% + % \labelsepだけあけるのは一つ目（ラベルの直後）のみ + \setlength{\itemindent}{\labelsep}% +} + +\def\@listi{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@i\relax}% + \setlength{\leftmargin}{\leftmargini}% +} +\let\@listI\@listi +\def\@listii{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@ii\relax}% + \setlength{\leftmargin}{\leftmarginii}% +} +\def\@listiii{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@iii\relax}% + \setlength{\leftmargin}{\leftmarginiii}% +} +\def\@listiv{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@iv\relax}% + \setlength{\leftmargin}{\leftmarginiv}% +} +\def\@listv{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@v\relax}% + \setlength{\leftmargin}{\leftmarginv}% +} +\def\@listvi{% + \jlreq@init@list + \setlength{\topsep}{\dimexpr\jlreq@itemization@beforeafter@space@vi\relax}% + \setlength{\leftmargin}{\leftmarginvi}% +} + +\if@tate + \renewcommand{\theenumi}{\jlreq@Kanji{enumi}} + \renewcommand{\theenumii}{\jlreq@rensuji{\@arabic\c@enumii}} + \renewcommand{\theenumiii}{\jlreq@rensuji{\@arabic\c@enumiii}} + \renewcommand{\theenumiv}{\jlreq@rensuji{\@arabic\c@enumiv}} + \newcommand{\labelenumi}{\theenumi} + \newcommand{\labelenumii}{\theenumii} + \newcommand{\labelenumiii}{\theenumiii} + \newcommand{\labelenumiv}{\theenumiv} +\else + \renewcommand{\theenumi}{\@arabic\c@enumi} + \renewcommand{\theenumii}{\@alph\c@enumii} + \renewcommand{\theenumiii}{\@roman\c@enumiii} + \renewcommand{\theenumiv}{\@Alph\c@enumiv} + \newcommand{\labelenumi}{\theenumi.} + \newcommand{\labelenumii}{(\theenumii)} + \newcommand{\labelenumiii}{\theenumiii.} + \newcommand{\labelenumiv}{\theenumiv.} +\fi +\renewcommand{\p@enumii}{\theenumi} +\renewcommand{\p@enumiii}{\theenumi(\theenumii)} +\renewcommand{\p@enumiv}{\p@enumiii\theenumiii} + +\newcommand{\labelitemi}{\hbox to 1\zw{\hss\textbullet\hss}} +%\newcommand{\labelitemi}{•} +\if@tate + \newcommand{\labelitemii}{○} + \newcommand{\labelitemiii}{＊} +\else + \newcommand{\labelitemii}{\hbox to 1\zw{\hss\textendash\hss}} + \newcommand{\labelitemiii}{\hbox to 1\zw{\hss\textasteriskcentered\hss}} +\fi +\newcommand{\labelitemiv}{\hbox to 1\zw{\hss ・\hss}} + +% 引用系．3.5.2の例． +\jlreq@jlreqsetup@add{quote_indent}{\def\jlreq@quote@indent{#1}} +\jlreq@jlreqsetup@add{quote_end_indent}{\def\jlreq@quote@end@indent{#1}} +\jlreq@jlreqsetup@add{quote_fontsize}[normalsize,small,footnotesize,scriptsize,tiny,]{\jlreq@ifempty{#1}{\def\jlreq@quote@fontsize{}}{\edef\jlreq@quote@fontsize{\expandonce{\csname #1\endcsname}}}} +\jlreq@jlreqsetup@add{quote_beforeafter_space}{\def\jlreq@quote@beforeafter@space{#1}} +\jlreqsetup{quote_indent=2\zw,quote_end_indent=0pt,quote_fontsize=,quote_beforeafter_space=0pt} + +\newenvironment{verse} + {\let\\\@centercr + \list{}{\itemsep\z@ \itemindent -2\jlreq@mol + \listparindent\itemindent + \labelwidth\z@ + \labelsep\z@ + \leftmargin=\dimexpr\jlreq@quote@indent\relax + \addtolength{\leftmargin}{2\jlreq@mol}% + \rightmargin=\dimexpr\jlreq@quote@end@indent\relax + \jlreq@quote@fontsize + \@tempdima=1\zw + \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax + \@tempdimc=\@tempdimb + \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima + \topsep=\dimexpr\jlreq@quote@beforeafter@space\relax + \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax}% + \item\relax}{\endlist} +\newenvironment{quotation} + {\list{}{% + \leftmargin=\dimexpr\jlreq@quote@indent\relax + \rightmargin=\dimexpr\jlreq@quote@end@indent\relax + \jlreq@quote@fontsize + \@tempdima=1\zw + \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax + \@tempdimc=\@tempdimb + \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima + \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax + \listparindent\parindent + \itemindent\listparindent + \labelwidth\z@ + \labelsep\z@ + \topsep=\dimexpr\jlreq@quote@beforeafter@space\relax + \parsep\z@ \@plus.1\jlreq@gol}% + \item\relax}{\endlist} +\newenvironment{quote} + {\list{}{% + \leftmargin=\dimexpr\jlreq@quote@indent\relax + \rightmargin=\dimexpr\jlreq@quote@end@indent\relax + \jlreq@quote@fontsize + \@tempdima=1\zw + \@tempdimb=\dimexpr\linewidth - \@totalleftmargin - \leftmargin - \rightmargin\relax + \@tempdimc=\@tempdimb + \divide\@tempdimb by \@tempdima\multiply\@tempdimb by \@tempdima + \leftmargin=\dimexpr\leftmargin + \@tempdimc - \@tempdimb\relax + \labelwidth\z@ + \itemindent\z@ + \topsep=\jlreq@speciallength{\jlreq@quote@beforeafter@space}% + \listparindent\z@}% + \item\relax}{\endlist} + +%. 表関係 4.4 +% 表内の行間を0にする（4.4.3.f） +\jlreq@saveoriginalcs{\tabular} +\jlreq@saveoriginalcs{\endtabular} +\preto\tabular{\begingroup\appto\@arrayparboxrestore{\baselineskip=0pt\lineskip=0pt}} +\appto\endtabular{\endgroup} +% 4.4.3.e +\setlength\tabcolsep{.5\zh} +\setlength\arraycolsep{.5\zw} +% 4.4.3.j +\setlength\arrayrulewidth{\jlreq@omotekeiwidth} % 4.4.3.c +\setlength\doublerulesep{2pt} +\setlength\tabbingsep{\labelsep} +\skip\@mpfootins=\skip\footins +\setlength\fboxsep{.3\zw} +\setlength\fboxrule{\jlreq@omotekeiwidth} % 根拠はない +% 後で +\ifthenelse{\equal{\jlreq@article@type}{article}}{% + \renewcommand{\theequation}{\@arabic\c@equation} +}{% + \@addtoreset{equation}{chapter} + \renewcommand{\theequation}{\ifnum\c@chapter>\z@\thechapter.\fi \@arabic\c@equation} +} + +%. 目次 +\setcounter{tocdepth}{3} +\newcommand{\@pnumwidth}{2\jlreq@mol} +\newcommand{\@tocrmarg}{2.55em} +\newcommand{\@dotsep}{2} % 狭くしてみた +\newskip\toclineskip +\setlength\toclineskip{0\jlreq@gol plus .02\jlreq@gol} +% tarticleから +\newdimen\@lnumwidth +\def\numberline#1{\hbox to\@lnumwidth{#1\hfil}} +\def\addcontentsline#1#2#3{% + \protected@write\@auxout{% + \let\label\@gobble\let\index\@gobble\let\glossary\@gobble + \if@tate + \@temptokena{\jlreq@rensuji{\thepage}}% + \else + \@temptokena{\thepage}% + \fi + }{\string\@writefile{#1}{\protect\contentsline{#2}{#3}{\the\@temptokena}}}% +} + +\newcount\jlreq@top@contents % トップ見出しを入れる．レベルと同じ値． +\jlreq@top@contents=-100 +\newcommand*{\jlreq@set@top@contents}[1]{% + \ifnum\jlreq@top@contents=-100 + \jlreq@top@contents=#1\relax + \fi +} +\ifthenelse{\equal{\jlreq@article@type}{article}}{ + \newcommand{\tableofcontents}{% + \jlreq@top@contents=-100\relax + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \section*{\contentsname}% + \@mkboth{\contentsname}{\contentsname}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi + } +}{% book, report + \newcommand{\tableofcontents}{% + \jlreq@top@contents=-100\relax + \if@twocolumn + \@restonecoltrue\onecolumn + \else + \@restonecolfalse + \fi + \chapter*{\contentsname}% + \@mkboth{\contentsname}{\contentsname}% + \@starttoc{toc}% + \if@restonecol\twocolumn\fi + } +} +% JIS X 4051自身の目次に近づけようかと……なりきれてないけど． +% 文字の大きさは全て同じ（\normalsize）にする． +% 見出しのレベルがあがると1文字分ずつ字下げしていく． +% 第三引数は，上からの幅に加え更にトップの見出しからの差による補正（プラス）が入る． +% 補正には\jlreq@top@contentsを使う． +% 「トップ」というか，一番最初に現れた見出しを入れる． +% リーダーは.から・に変更しました． +\def\@dottedtocline#1#2#3#4#5{% + \jlreq@set@top@contents{#1}% + \ifnum #1>\c@tocdepth \else + \vskip\toclineskip + {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip + \parindent #2\relax\@afterindenttrue + \interlinepenalty\@M + \leavevmode + \@lnumwidth #3\relax + \@tempcnta=#1\relax + \advance\@tempcnta by -\jlreq@top@contents + \@tempdima=1\jlreq@mol + \multiply \@tempdima by \@tempcnta + \advance\leftskip \@lnumwidth \hbox{}\hskip -\leftskip + \advance\leftskip\@tempdima + {#4}\nobreak + \leaders\hbox{$\m@th\mkern \@dotsep mu$\null\inhibitglue ・\inhibitglue\null$\m@th\mkern \@dotsep mu$}% + \hfill\nobreak + \hb@xt@\@pnumwidth{\hss\normalfont\normalcolor #5}% + \par}% + \fi} + +% listoffigures +\newcommand{\listoffigures}{% + \jlreq@top@contents=-100 + \section*{\listfigurename}% + \@mkboth{\listfigurename}{\listfigurename}% + \@starttoc{lof}% +} +\newcommand*{\l@figure}{\@dottedtocline{1}{0\jlreq@gol}{2\jlreq@gol}} +\newcommand{\listoftables}{% + \jlreq@top@contents=-100 + \section*{\listtablename}% + \@mkboth{\listtablename}{\listtablename}% + \@starttoc{lot}% +} +\let\l@table\l@figure + +%. 文献，そのまま +\newdimen\bibindent +\setlength\bibindent{2\jlreq@mol} +\newcommand{\newblock}{\hskip .11em\@plus.33em\@minus.07em} +\newenvironment{thebibliography}[1]{% + \jlreq@oldfontcommand@enable + \section*{\refname}% + \@mkboth{\refname}{\refname}% + \list{\@biblabel{\@arabic\c@enumiv}}% + {\settowidth\labelwidth{\@biblabel{#1}}% + \leftmargin\labelwidth + \advance\leftmargin\labelsep + \itemindent=0pt + \@openbib@code + \usecounter{enumiv}% + \let\p@enumiv\@empty + \renewcommand\theenumiv{\@arabic\c@enumiv}}% + \sloppy + \clubpenalty4000 + \@clubpenalty\clubpenalty + \widowpenalty4000% + \sfcode`\.\@m +}{% + \def\@noitemerr{\@latex@warning{Empty `thebibliography' environment}}% + \endlist + \jlreq@oldfontcommand@disable +} +\let\@openbib@code\@empty +\if@tate + \def\@cite#1#2{\jlreq@rensuji{[{#1\if@tempswa , #2\fi}]}} + \def\@biblabel#1{\jlreq@rensuji{[#1]}} +\fi + +%. 索引 +\newif\ifjlreq@resttate +\newenvironment{theindex}{% + \jlreq@oldfontcommand@enable + \jlreq@iftdir{\clearpage\yoko\jlreq@resttatetrue}{\jlreq@resttatefalse}% 常に横書きにする + \if@twocolumn\@restonecolfalse\else\@restonecoltrue\fi + \columnseprule\z@ \columnsep 2\jlreq@mol + \twocolumn[\section*{\indexname}]% + \@mkboth{\indexname}{\indexname}% + \thispagestyle{plain}% + \parindent\z@ + \parskip\z@ \@plus .03\jlreq@gol\relax + \let\item\@idxitem +}{% + \if@restonecol\onecolumn\else\clearpage\fi + \ifjlreq@resttate\tate\fi + \jlreq@oldfontcommand@disable +} +\newcommand{\@idxitem}{\par\hangindent 4\jlreq@mol} +\newcommand{\subitem}{\@idxitem \hspace*{2\jlreq@mol}} +\newcommand{\subsubitem}{\@idxitem \hspace*{3\jlreq@mol}} +\newcommand{\indexspace}{\par \vskip 1\jlreq@gol \@plus .5\jlreq@gol \@minus .3\jlreq@gol\relax} + + +%. 前付，後付，付録 +\ifthenelse{\equal{\jlreq@article@type}{book}}{ + \newif\if@mainmatter + \@mainmattertrue + \newcommand*{\frontmatter}{% + \cleardoublepage + \@mainmatterfalse + \let\jlreq@pagestyle@atmain\jlreq@current@pagestyle + \SaveHeading{chapter}{\jlreq@heading@chapter@atmain}% + \ModifyHeading{chapter}{label_format={},after_label_space=0pt}% + \pagestyle{plain}% + \pagenumbering{roman}} + \newcommand*{\mainmatter}{% + \cleardoublepage + \@mainmattertrue + \@ifundefined{jlreq@pagestyle@atmain}{}{% + \expandafter\pagestyle\expandafter{\jlreq@pagestyle@atmain}% + }% + \@ifundefined{jlreq@heading@chapter@atmain}{}{\jlreq@heading@chapter@atmain}% + \setcounter{chapter}{0}% + \pagenumbering{arabic}} + \newcommand*{\backmatter}{% + \if@openright + \cleardoublepage + \else + \clearpage + \fi + \ifthenelse{\equal{\jlreq@article@type}{article}}{}{%book, report + \SaveHeading{chapter}{\jlreq@heading@chapter@atmain}% + \ModifyHeading{chapter}{label_format={},after_label_space=0pt}% + }% + \pagestyle{plain}% + \@mainmatterfalse + \setcounter{chapter}{0}} +}{} +\newcommand*{\appendix}{\par + \setcounter{section}{0}% +} + +\ifthenelse{\equal{\jlreq@article@type}{article}}{ + \appto\appendix{% + \setcounter{subsection}{0}% + \if@tate + \def\thesection{\jlreq@rensuji{\Alph{section}}}% + \else + \def\thesection{\Alph{section}}% + \fi + } +}{%book, report + \appto\appendix{% + \setcounter{chapter}{0}% + \if@tate + \def\thechapter{\jlreq@rensuji{\Alph{chapter}}}% + \else + \def\thechapter{\Alph{chapter}}% + \fi + \ModifyHeading{chapter}{label_format={付録\thechapter}}% + \ifx\jlreq@current@pagestyle\@undefined\else + \ifthenelse{\equal{\jlreq@current@pagestyle}{headings}}{% + \def\chaptermark#1{\markboth{付録\thechapter\quad #1}{}}% + \ModifyPageStyle{headings}{mark_format={_chapter={付録\thechapter\quad #1}}}% + }{}% + \fi + } +} + +%. その他諸々 +%.. 縦中横 +\DeclareRobustCommand*{\tatechuyoko}[1]{% + \jlreq@ifydir{\ClassError{jlreq}{\string\tatechuyoko\space is not allowed in yoko mode}{\@ehc}}{}% + \jlreq@lastnodechar=\lastnodechar + \ifvmode\leavevmode\fi + % 前のJFM glue + \ifnum\jlreq@lastnodechar=-1\else + \inhibitglue + \jlreq@calc@jfmglue{\char\jlreq@lastnodechar}{阿}% + \jlreq@ifgluezero\jlreq@resultskip{}{\hskip\jlreq@resultskip}% + \fi + \hbox{\yoko + \setbox\jlreq@tempboxa=\hbox{阿}% + \vrule width 0pt height \ht\jlreq@tempboxa depth \dp\jlreq@tempboxa #1}% + \futurelet\jlreq@nextchar\jlreq@tatechuyoko@ +} +\def\jlreq@tatechuyoko@{% + \begingroup + \def\jlreq@do{}% + \jlreq@getfirsttoken@expandmacros{\jlreq@nextchar}{\jlreq@tempa}% + \expandafter\jlreq@ifletter\expandafter{\jlreq@tempa}{% + \jlreq@calc@jfmglue{阿}{\jlreq@tempa}% + \edef\jlreq@do{% + \noexpand\hskip\the\jlreq@resultskip\space + \noexpand\inhibitglue + }% + }{}% + \expandafter\endgroup + \jlreq@do +} + +% 日にち +\newif\if西暦 +\def\西暦{\西暦true} +\def\和暦{\西暦false} +% #1年#2月#3日 #4は\numberとか\kansujiとか +\def\jlreq@wareki#1#2#3#4{% + \jlreq@warekiyear{#1}{#2}{#3}{#4}% + #4#2月#4#3日% +} +\def\jlreq@warekiyear#1#2#3#4{% + % 昭和：1989年1月7日まで + \ifnum0\ifnum#1<1988 1\fi\ifnum#1=1989 \ifnum#2=1 \ifnum#3<8 1\fi\fi\fi>0 + 昭和\jlreq@warekiyear@{#1}{1926}{#4}% + % 平成：2019年4月末日まで + \else%\ifnum0\ifnum#1<2019 1\fi\ifnum#1=1989 \ifnum#2<5 1\fi\fi>0 + 平成\jlreq@warekiyear@{#1}{1989}{#4}% +% \else +% 新元号\jlreq@warekiyear@{#1}{2019}{#4}% + \fi%\fi +} +\def\jlreq@warekiyear@#1#2#3{\ifnum#1=#2 元年\else #3\numexpr#1-#2+1\relax 年\fi} +\def\today{% + \if西暦 + \jlreq@iftdir{% + \kansuji\year 年% + \kansuji\month 月% + \kansuji\day 日% + }{% + \number\year 年% + \number\month 月% + \number\day 日% + }% + \else + \jlreq@iftdir{% + \jlreq@wareki{\year}{\month}{\day}{\kansuji}% + }{% + \jlreq@wareki{\year}{\month}{\day}{\number}% + }% + \fi +} +\jlreq@jlreqsetup@add{year_style}[seireki,wareki]{% + \jlreq@switch{#1}{% + {seireki}{\西暦true} + {wareki}{\西暦false} + } +} +\if@tate + \jlreqsetup{year_style=wareki} +\else + \jlreqsetup{year_style=seireki} +\fi + +% 時刻 +\hour=\time \divide\hour by 60 +\minute=\numexpr\time - 60*\hour\relax + +%.. 定理環境 +\jlreq@saveoriginalcs{\@begintheorem} +\jlreq@saveoriginalcs{\@opargbegintheorem} +\def\@begintheorem#1#2{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax + \trivlist\labelsep=1\zw + \itemindent=\dimexpr\jlreq@theorem@indent\relax + \item[\hskip \labelsep{\sffamily\bfseries #1\ #2}]} +\def\@opargbegintheorem#1#2#3{\topsep=\dimexpr\jlreq@theorem@beforeafter@space\relax + \trivlist\labelsep=1\zw + \itemindent=\dimexpr\jlreq@theorem@indent\relax + \item[\hskip \labelsep{\sffamily\bfseries #1\ #2（#3）}]} +\AtEndOfPackageFile*{amsthm}{% + \jlreq@saveoriginalcs{\proof}% + \jlreq@saveoriginalcs{\endproof}% + \edef\jlreq@do{ + \unexpanded{\def\jlreq@proof[#1]}{% + \unexpanded{\labelsep=1\zw}% + \expandonce{\proof[{\reset@font\sffamily\bfseries #1\inhibitglue}\nopunct]}% + } + } + \jlreq@do + \def\proof{\@ifnextchar[{\jlreq@proof}{\jlreq@proof[\proofname]}} + \renewcommand{\proofname}{証明} + \jlreq@setupamsthm + \theoremstyle{jlreq} +} +\def\jlreq@setupamsthm{ + \newtheoremstyle{jlreq}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\dimexpr\jlreq@theorem@beforeafter@space\relax}{\normalfont}{\dimexpr\jlreq@theorem@indent\relax}{\sffamily\bfseries}{}{1\zw}{\thmname{##1}\thmnumber{\ ##2}\thmnote{（##3）}} +} +\jlreq@jlreqsetup@add{theorem_beforeafter_space}{ + \def\jlreq@theorem@beforeafter@space{#1} + \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} +} +\jlreq@jlreqsetup@add{theorem_indent}{ + \def\jlreq@theorem@indent{#1} + \@ifpackageloaded{amsthm}{\jlreq@setupamsthm}{} +} +\jlreqsetup{theorem_beforeafter_space=1\baselineskip,theorem_indent=0pt} + + +% デフォルト設定 +\newcommand{\contentsname}{目次} +\newcommand{\refname}{参考文献} +\newcommand{\indexname}{索引} +\pagestyle{plain} +\pagenumbering{arabic} +\if@twocolumn + \twocolumn + \sloppy + \flushbottom +\else + \onecolumn + \raggedbottom +\fi +\endinput + + diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq-helpers.sty 2018-08-16 20:48:00.000000000 +0000 @@ -1,7 +1,7 @@ % エンジン非依存のマクロ集 \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jlreq-helpers}[2018/04/12 jlreq-helpers] +\ProvidesPackage{jlreq-helpers}[2018/08/15 jlreq-helpers] \RequirePackage{xkeyval,etoolbox} %. helper1 @@ -162,9 +162,15 @@ % もしカンマがない場合は\ifjlreq@resultがfalseになる． \newcommand*{\jlreq@helper@dividebycomma}[1]{\jlreq@helper@dividebycomma@#1,\jlreq@endmark} \def\jlreq@helper@dividebycomma@#1,#2\jlreq@endmark{% - \def\jlreq@resulta{#1}% - \def\jlreq@resultb{#2}% - \ifx\jlreq@resultb\@empty\jlreq@resultfalse\else\jlreq@resulttrue\expandafter\def\expandafter\jlreq@resultb\expandafter{\jlreq@helper@removelastcomma#2\jlreq@endmark}\fi + \jlreq@remove@spaceandbracket{#1}{\jlreq@resulta}% + \jlreq@remove@spaceandbracket{#2}{\jlreq@resultb}% + \ifx\jlreq@resultb\@empty\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi{% + \jlreq@resultfalse + }{% + \jlreq@resulttrue + \expandafter\def\expandafter\jlreq@resultb\expandafter{\jlreq@helper@removelastcomma#2\jlreq@endmark}% + \expandafter\jlreq@remove@spaceandbracket\expandafter{\jlreq@resultb}{\jlreq@resultb}% + }% } \def\jlreq@helper@removelastcomma#1,\jlreq@endmark{#1} @@ -243,21 +249,60 @@ \begingroup \def\jlreq@do{}% \def\jlreq@parsekeyval@nokey@execute##1##2{#1}% - \expandafter\jlreq@parsekeyval@nokey@#2,\jlreq@endmark,% + \expandafter\jlreq@parsekeyval@nokey@i#2,\jlreq@endmark,% \expandafter\endgroup \jlreq@do } -\long\def\jlreq@parsekeyval@nokey@#1,{% - \jlreq@ifendmark{#1}{}{\jlreq@parsekeyval@nokey@@#1=\jlreq@endmark}% +\long\def\jlreq@parsekeyval@nokey@i#1,{\jlreq@ifendmark{#1}{}{\jlreq@parsekeyval@nokey@ii#1=\jlreq@endmark}} +\long\def\jlreq@parsekeyval@nokey@ii#1=#2\jlreq@endmark{% + \jlreq@ifempty{#2}{\jlreq@parsekeyval@nokey@iii{#2}{#1}}{% + \edef\jlreq@tempa{% + \noexpand\jlreq@parsekeyval@nokey@iii{\jlreq@parsekeyval@nokey@removeequal{#2}}{\unexpanded{#1}}% + }% + \jlreq@tempa + }% +} +\long\def\jlreq@parsekeyval@nokey@iii#1#2{% + \jlreq@remove@spaceandbracket{#1}{\jlreq@tempa}% + \jlreq@remove@spaceandbracket{#2}{\jlreq@tempb}% + \ifx\jlreq@tempa\@empty\expandafter\@gobble\else\expandafter\@firstofone\fi + {% + \edef\@tempa{\noexpand\jlreq@parsekeyval@nokey@iv{\expandonce{\jlreq@tempb}}{\expandonce{\jlreq@tempa}}}% + \@tempa + }% + \jlreq@parsekeyval@nokey@i } -\long\def\jlreq@parsekeyval@nokey@@#1=#2\jlreq@endmark{% - \jlreq@ifempty{#2}{\jlreq@parsekeyval@nokey@@@{}{#1}}{\expandafter\jlreq@parsekeyval@nokey@@@\expandafter{\jlreq@parsekeyval@nokey@@@@#2\jlreq@endmark}{#1}}% +\long\def\jlreq@parsekeyval@nokey@iv#1#2{% + \eappto\jlreq@do{\expandonce{\jlreq@parsekeyval@nokey@execute{#1}{#2}}}% } -\long\def\jlreq@parsekeyval@nokey@@@#1#2{% - \eappto\jlreq@do{\expandonce{\jlreq@parsekeyval@nokey@execute{#2}{#1}}}% - \jlreq@parsekeyval@nokey@ +\long\def\jlreq@parsekeyval@nokey@removeequal#1{\jlreq@parsekeyval@nokey@removeequal@\jlreq@uniqtoken#1\jlreq@endmark} +\long\def\jlreq@parsekeyval@nokey@removeequal@#1=\jlreq@endmark{\expandafter\unexpanded\expandafter{\@gobble#1}} + +% #1の先頭のスペースを削除し，#2に入れる．ただし#1={ X}の時は" X"が入る． +\def\jlreq@do#1{% #1 = " "として後で実行 + \long\def\jlreq@remove@spaceandbracket##1##2{% + \begingroup + \def\jlreq@tempa{}% + \futurelet\jlreq@nextchar\jlreq@remove@spaceandbracket@i##1\jlreq@uniqtoken#1\jlreq@uniqtoken\jlreq@endmark + \edef\jlreq@do{\noexpand\edef\noexpand##2{\noexpand\unexpanded{\expandonce{\jlreq@tempa}}}}% + \expandafter\endgroup + \jlreq@do + } + \def\jlreq@remove@spaceandbracket@i{% + \ifx#1\jlreq@nextchar\expandafter\jlreq@remove@spaceandbracket@ii\else\expandafter\jlreq@remove@spaceandbracket@iii\fi + }% + \def\jlreq@remove@spaceandbracket@ii#1{\futurelet\jlreq@nextchar\jlreq@remove@spaceandbracket@i}% + \long\def\jlreq@remove@spaceandbracket@iii##1#1\jlreq@uniqtoken##2\jlreq@endmark{% + \jlreq@ifempty{##2}{% + \expandafter\jlreq@remove@spaceandbracket@iv\expandafter{\jlreq@removelastuniqtoken##1}% + }{% + \jlreq@remove@spaceandbracket@iv{##1}% + }% + }% } -\long\def\jlreq@parsekeyval@nokey@@@@#1=\jlreq@endmark{#1} +\jlreq@do{ } +\long\def\jlreq@removelastuniqtoken#1\jlreq@uniqtoken{#1} +\long\def\jlreq@remove@spaceandbracket@iv#1{\edef\jlreq@tempa{\unexpanded{#1}}} % \jlreq@switch{str}{ % {str}{abcd} @@ -460,5 +505,14 @@ \jlreq@do } +\def\jlreq@for@noexpand#1:={\@for#1:=\@empty} + +\def\jlreq@swap#1#2{% + \let\jlreq@swaptoken=#1% + \let#1=#2% + \let#2=\jlreq@swaptoken + \let\jlreq@swaptoken=\@undefined +} + \endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2018-06-17 21:04:11.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty 2018-08-08 21:05:58.000000000 +0000 @@ -1,5 +1,5 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jlreq-trimmarks}[2018/06/17 jlreq-trimmarks] +\ProvidesPackage{jlreq-trimmarks}[2018/08/08 jlreq-trimmarks] \RequirePackage{xkeyval,etoolbox} \RequirePackage{jlreq-helpers} @@ -52,7 +52,7 @@ } \newcommand*{\jlreq@trimmarks@addpapersize@@}[3]{% \@for\@tempa:=#1\do{% - \eappto\jlreq@trimmarks@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\def\jlreq@trimmarks@paperwidth{#2}\def\jlreq@trimmarks@paperheight{#3}}}}% + \eappto\jlreq@trimmarks@switchpapersize{{\expandonce{\@tempa}}{\unexpanded{\def\jlreq@resulta{#2}\def\jlreq@resultb{#3}}}}% }% } \jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@switchpapersize} @@ -100,21 +100,24 @@ \jlreq@trimmarks@addpapersize{executive}[executive] \jlreq@trimmarks@addpapersize{hagaki}[hagaki] -\DeclareOptionX{trimmarks_paper}{ - \edef\jlreq@do{% - \unexpanded{\jlreq@switch{#1}}{\expandonce{\jlreq@trimmarks@switchpapersize}}% - [\unexpanded{% - \jlreq@helper@dividebycomma{#1}% - \ifjlreq@result - \edef\jlreq@trimmarks@paperwidth{\jlreq@resulta} - \edef\jlreq@trimmarks@paperheight{\jlreq@resultb} - \else - \PackageError{jlreq}{The paper #1 is unknown}{\@ehc}% - \fi - }]% - }% - \jlreq@do -} +% width -> \jlreq@resulta, height -> \jlreq@resultb +\edef\jlreq@trimmarks@analyzepapersize#1{% + \noexpand\jlreq@switch{#1}{% + \expandonce{\jlreq@trimmarks@switchpapersize}% + {% + \noexpand\jlreq@helper@dividebycomma{#1} + \unexpanded{\ifjlreq@result\else} + \unexpanded{\def\jlreq@resulta}{#1} + \unexpanded{\def\jlreq@resultb}{#1} + \noexpand\fi + }% + }\noexpand\relax% +} +\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@analyzepapersize} + +\def\jlreq@trimmarks@option@papersize{+2in} +\DeclareOptionX{trimmarks_paper}{\def\jlreq@trimmarks@option@papersize{#1}} +\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@option@papersize} \newif\ifjlreq@trimmarks@digital \jlreq@trimmarks@digitaltrue \newif\ifjlreq@trimmarks@show \jlreq@trimmarks@showtrue @@ -136,6 +139,9 @@ } } } +\newif\ifjlreq@trimmarks@landscape \jlreq@trimmarks@landscapefalse +\jlreq@trimmarks@DeclareOption{landscape}{\jlreq@trimmarks@landscapetrue} +\jlreq@trimmarks@afterpkg@addtodeleteif{\ifjlreq@trimmarks@landscape} \let\jlreq@temporary@original@@removeelement=\@removeelement \let\@removeelement=\jlreq@helper@removeelement @@ -143,9 +149,37 @@ \let\@removeelement=\jlreq@temporary@original@@removeelement \let\jlreq@temporary@original@@removeelement=\@undefined +\def\jlreq@trimmarks@setpapersize#1{% + \jlreq@ifcontains{#1}{+}{ + \def\@tempa##1+##2\jlreq@endmark{% + \jlreq@ifempty{##1}{ + \let\jlreq@tempa=\paperwidth + \let\jlreq@tempb=\paperheight + }{ + \jlreq@trimmarks@analyzepapersize{##1} + \let\jlreq@tempa=\jlreq@resulta + \let\jlreq@tempb=\jlreq@resultb + \ifjlreq@trimmarks@landscape\jlreq@swap{\jlreq@tempa}{\jlreq@tempb}\fi + } + \jlreq@trimmarks@analyzepapersize{##2} + \ifjlreq@trimmarks@landscape\jlreq@swap{\jlreq@resulta}{\jlreq@resultb}\fi + \edef\jlreq@trimmarks@paperwidth{\the\dimexpr\jlreq@tempa + \jlreq@resulta\relax} + \edef\jlreq@trimmarks@paperheight{\the\dimexpr\jlreq@tempb + \jlreq@resultb\relax} + } + \@tempa#1\jlreq@endmark + }{ + \jlreq@trimmarks@analyzepapersize{#1} + \ifjlreq@trimmarks@landscape\jlreq@swap{\jlreq@resulta}{\jlreq@resultb}\fi + \edef\jlreq@trimmarks@paperwidth{\jlreq@resulta} + \edef\jlreq@trimmarks@paperheight{\jlreq@resultb} + } +} +\jlreq@trimmarks@afterpkg@addtodeletecs{\jlreq@trimmarks@setpapersize} +\expandafter\jlreq@trimmarks@setpapersize\expandafter{\jlreq@trimmarks@option@papersize} + \ifx o\jlreq@trimmarks@driver \ifjlreq@trimmarks@digital - \ClassError{jlreq}{`show=digital' can't be used with the driver `dviout'}{\@ehc} + \PackageError{jlreq-trimmarks}{`show=digital' can't be used with the driver `dviout'}{\@ehc} \fi \fi @@ -215,11 +249,6 @@ \fi \fi -\ifx\jlreq@trimmarks@paperwidth\@undefined - \edef\jlreq@trimmarks@paperwidth{\the\dimexpr\paperwidth + 2in\relax} - \edef\jlreq@trimmarks@paperheight{\the\dimexpr\paperheight + 2in\relax} -\fi - \ifx l\jlreq@engine \setlength{\pagewidth}{\dimexpr\jlreq@trimmarks@paperwidth\relax} \setlength{\pageheight}{\dimexpr\jlreq@trimmarks@paperheight\relax} diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/plautopatch/plautopatch.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/plautopatch/plautopatch.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/plautopatch/plautopatch.sty 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/plautopatch/plautopatch.sty 2018-08-22 21:30:14.000000000 +0000 @@ -0,0 +1,177 @@ +% +% plautopatch.sty +% written by Hironobu Yamashita (@aminophen) +% +% This package is part of the plautopatch bundle. +% https://github.com/aminophen/plautopatch +% + +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{plautopatch} + [2018/08/22 v0.3 Automated patches for pLaTeX/upLaTeX] +\def\platpc@pkgname{plautopatch} +\def\platpc@err{\PackageError\platpc@pkgname} +\def\platpc@warn{\PackageWarningNoLine\platpc@pkgname} +\def\platpc@info{\PackageInfo\platpc@pkgname} + +\RequirePackage{filehook} + +% low-level helpers + +%% \platpc@ifreq@add{} +% = if not loaded yet, \RequirePackage{} +% and add to list. +\def\platpc@ifreq@add#1{% + \@ifpackageloaded{#1}{}{% + \RequirePackage{#1}\platpc@addtolist{#1}% + }% +} + +%% \platpc@addtolist{} +% = add to list named \platpc@list. +\def\platpc@addtolist#1{\xdef\platpc@list{\platpc@list, #1}} +\def\platpc@list{}% initialize + +%% \platpc@ifnotdisabled{}{} +% = execute if is not disabled. +\def\platpc@ifnotdisabled#1{% + \expandafter\ifx\csname platpc@disable@#1\endcsname\relax + \expandafter\@firstofone + \fi +} + +%% \platpc@ifloadederr{} +% = throw an error if is already loaded. +\def\platpc@ifloadederr#1{% + \@ifpackageloaded{#1}{% + \platpc@err{Package `#1' already loaded!\MessageBreak + Use \string\RequirePackage{\platpc@pkgname} earlier}\@ehc + }% +} + +% high-level helpers + +%% \platpc@patch@after{}{} +% = Load after . +\def\platpc@patch@after#1#2{% + \expandafter\def\csname platpc@end@#1\endcsname{% + \platpc@ifnotdisabled{#1}{\platpc@ifreq@add{#2}}% + }% + \@ifpackageloaded{#1}{% + \csname platpc@end@#1\endcsname + }{% + \AtEndOfPackageFile{#1}{\csname platpc@end@#1\endcsname}% + }% +} +\@onlypreamble\platpc@patch@after + +%% \platpc@patch@after@both{}{}{} +% = Load after both & . +\def\platpc@patch@after@both#1#2#3{% + \expandafter\def\csname platpc@end@#1+#2\endcsname{% + \platpc@ifnotdisabled{#1}{\platpc@ifnotdisabled{#2}{% + \platpc@ifreq@add{#3}% + }}% + }% + \@ifpackageloaded{#1}{% + \@ifpackageloaded{#2}{% + \csname platpc@end@#1+#2\endcsname + }{% + \AtEndOfPackageFile{#2}{\csname platpc@end@#1+#2\endcsname}% + }% + }{% + \@ifpackageloaded{#2}{% + \AtEndOfPackageFile{#1}{\csname platpc@end@#1+#2\endcsname}% + }{% + \AtEndOfPackageFile{#1}{% + \@ifpackageloaded{#2}{\csname platpc@end@#1+#2\endcsname}{}% + }% + \AtEndOfPackageFile{#2}{% + \@ifpackageloaded{#1}{\csname platpc@end@#1+#2\endcsname}{}% + }% + }% + }% +} +\@onlypreamble\platpc@patch@after@both + +%% \platpc@patch@before{}{} +% = Load before . +% used when both conditions are met: +% - must be loaded *before* +% - contains \RequirePackage{} +\def\platpc@patch@before#1#2{% + \expandafter\def\csname platpc@begin@#1\endcsname{% + \platpc@ifnotdisabled{#1}{% + % if is already loaded, nothing to do + \@ifpackageloaded{#2}{}{% else + % the code (*!) should be used only once, + % remove it immediately when this macro is executed + \expandafter\let\csname platpc@begin@#1\endcsname\relax + % pretend as if not loaded + \expandafter\let\csname ver@#1.sty\endcsname\relax + % load the package + \RequirePackage{#2}\platpc@addtolist{#2}% + % avoid loading twice by discarding "\@@input " (*!) + \let\platpc@filehook@@atbegin\filehook@@atbegin + \def\filehook@@atbegin\@@input####1\filehook@atend{% + \let\filehook@@atbegin\platpc@filehook@@atbegin + % avoid infinite loop even when \AtEndOfPackageFile used + \expandafter\let\csname filehook@atend@#1.sty\endcsname\relax + \filehook@@atbegin + \filehook@atend}% + % all done + }% + }% + }% + % if is already loaded at this point, too late! + \platpc@ifloadederr{#1}% + % do it + \AtBeginOfPackageFile{#1}{\csname platpc@begin@#1\endcsname}% +} +\@onlypreamble\platpc@patch@before + +% interface for users who want don't patches + +%% \plautopatchdisable{,,...} +% = Disable patches triggered by , , ... +\newcommand{\plautopatchdisable}[1]{% + \edef\@tempa{\zap@space#1 \@empty}% + \@for\@tempa:=\@tempa\do{% + \expandafter\let\csname platpc@disable@\@tempa\endcsname\@empty + }% +} +\@onlypreamble\plautopatchdisable + +% show list of loaded patches + +\AtEndDocument{\platpc@showlist} +\def\platpc@showlist{% + \ifx\platpc@list\@empty + \platpc@info{No additional packages loaded} + \else + % the first token of \platpc@list should be ',' + \typeout{% + ***** List of packages loaded by `\platpc@pkgname': *****^^J% + \expandafter\@gobble\platpc@list.^^J% + *****************************************************}% + \fi +} + +% register patches + +\ifx\enablecjktoken\@undefined + \platpc@patch@after{tracefnt}{ptrace}% platex +\else + \platpc@patch@after{tracefnt}{uptrace}% uplatex +\fi +\platpc@patch@after{fltrace}{pfltrace}% platex +\platpc@patch@after{array}{plarray}% platex-tools +\platpc@patch@after@both{array}{plext}{plextarray}% platex-tools +\platpc@patch@after@both{delarray}{plext}{plextdelarray}% platex-tools +\platpc@patch@after{everysel}{pxeverysel}% platex-tools +\platpc@patch@after{everyshi}{pxeveryshi}% platex-tools +\platpc@patch@after{atbegshi}{pxatbegshi}% platex-tools +\platpc@patch@before{ftnright}{pxftnright}% platex-tools +\platpc@patch@after{pdfpages}{pxpdfpages}% (maintained here!) + +\endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty texlive-lang-2018.20180824/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty --- texlive-lang-2018.20180725/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/latex/plautopatch/pxpdfpages.sty 2018-08-21 21:51:42.000000000 +0000 @@ -0,0 +1,49 @@ +% +% pxpdfpages.sty +% written by Hironobu Yamashita (@aminophen) +% +% This package is part of the plautopatch bundle. +% https://github.com/aminophen/plautopatch +% +% This package `pxpdfpages.sty' is based on: +% * pdfpages.sty (2017/10/31 v0.5l) +% * plcore.ltx in platex (2018/05/13 v1.2z) +% + +%% package declaration +\NeedsTeXFormat{pLaTeX2e} +\ProvidesPackage{pxpdfpages} + [2018/08/20 v0.1 Patch to pdfpages for (u)pLaTeX] + +%% preparations +\def\pxpdpg@pkgname{pxpdfpages} +\def\pxpdpg@warn{\PackageWarningNoLine\pxpdpg@pkgname} +\def\pxpdpg@info{\PackageInfo\pxpdpg@pkgname} + +%% load it +\RequirePackageWithOptions{pdfpages} +\RequirePackage{pxatbegshi}% pdfpages requires atbegshi + +%% patch internal for pdfpages to work with tombow +%% Note: this code should be copied to gentombow.sty! +\def\pxpdpg@patch@pdfpages{% + \RequirePackage{etoolbox} + \patchcmd{\AM@output}{% + \setlength{\@tempdima}{\AM@xmargin}% + \edef\AM@xmargin{\the\@tempdima}% + \setlength{\@tempdima}{\AM@ymargin}% + \edef\AM@ymargin{\the\@tempdima}% + }{% + \setlength{\@tempdima}{\AM@xmargin\iftombow+1in\fi}% + \edef\AM@xmargin{\the\@tempdima}% + \setlength{\@tempdima}{\AM@ymargin\iftombow-1in\fi}% + \edef\AM@ymargin{\the\@tempdima}% + } + {\pxpdpg@info{Patch for pdfpages applied}} + {\pxpdpg@warn{Patch for pdfpages failed}}% + } +\AtBeginDocument{\@ifpackageloaded{pdfpages}{\pxpdpg@patch@pdfpages}{}} + +%% all done + +\endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua texlive-lang-2018.20180824/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2017-12-22 21:23:18.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/jlreq/jfm-jlreq.lua 2018-08-08 21:05:58.000000000 +0000 @@ -1,1195 +1,1195 @@ ---[[ -3.1.3 -3.1.6.a -]] - ---[[ -優先順位は，第n段階を3 - nに対応させる． - 段階 1, 2, 3, 4, 5, 6 -priority 2, 1, 0,-1,-2,-3 -xkanjiskipは{1,-3},kanjiskip={0,0} -\ltjsetparameter{stretch_priority={kanjiskip=1,xkanjiskip=-3}} -\ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=0}} -]] - -local stretch_width = 0.25 -- 空き第四段階の空き量 - -local hyphen_glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, - [27] = {0, stretch_width, 0, priority = {-1,0}}, ---[[ - [20] = {0, 0, 0}, - [21] = {0, 0, 0}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0}, - [30] = {0, 0, 0}, -]] -} - -local jfm = { - dir = 'yoko', - zw = 1.0, - zh = 1.0, - version = 3, - -- 文字クラス4,9,10,11,15,16,19との間は(x)kanjiskipで調整する． - kanjiskip = {0, 0.25, 0}, - xkanjiskip = {0.25, 0.25, 0.125}, - - -- alignは適当 - [1] = { -- 初め括弧類 - chars = {'（', '〔', '［', '｛', '〈', '《', '「', '『', '【', '｟', '〘', '〖', '«', '〝', - '‘', '“'}, - width = 0.5,height = 0.88,depth = 0.12, - align = 'right', - glue = { - [1] = {0, 0, 0}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, 0, 0}, - [13] = {0, 0, 0}, - [14] = {0, 0, 0}, - [15] = {0, 0, 0}, - [16] = {0, 0, 0}, - [0] = {0, 0, 0}, - [27] = {0, 0, 0}, ---[[ - [20] = {0, 0, 0}, - [21] = {0, 0, 0}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0}, - [30] = {0, 0, 0}, - -- [22][23] 注1 - ]] - }, - }, - - [2] = { -- 終わり括弧類 - chars = { '）', '〕', '］', '｝', '〉', '》', '」', '』', '】', '｠', '〙', '〗', '»', '〟', - '’', '”'}, - width = 0.5,height = 0.88,depth = 0.12, - align = 'left', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [22] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [23] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}}, - [28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [29] = {0, 0, 0}, - [30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - ]] - }, - end_adjust = {0.5,0}, - }, - - -- [3*]はハイフン類．幅が違うので分ける． - [300] = { - chars = {'‐'}, - width = 0.25,height = 0.88,depth = 0.12, - align = 'middle', - glue = hyphen_glue,-- 上の方で定義 - }, - - [301] = { - chars = {'゠', '–'}, - width = 0.5,height = 0.88,depth = 0.12, - align = 'middle', - glue = hyphen_glue, - }, - - [302] = { - chars = {'〜'}, - width = 1,height = 0.88,depth = 0.12, - align = 'middle', - glue = hyphen_glue, - }, - - [4] = { -- 区切り約物 - chars = {'！', '？', '‼', '⁇', '⁈', '⁉'}, - width = 1,height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0}, - [30] = {0, 0, 0}, - ]] - }, - }, - - [5] = { -- 中点類 - chars = {'・', '：', - '；' - }, - width = 0.5,height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}}, - [6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - [27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, - --[[ - [20] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [21] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [22] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [23] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [24] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [25] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [26] = {0.25, 0, 0, ratio = 0, priority = {0,-1}}, - [28] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [29] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - [30] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, - ]] - }, - end_adjust = {0.25,0}, -- 0.25 -> 0は詰め，優先順位は第三段階 - }, - - [6] = { -- 句点類 - chars = {'。', - '．'}, -- 縦書きでは使わない - width = 0.5,height = 0.88,depth = 0.12, - align = 'left', - glue = { - [1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0, ratio = 0}, - [301] = {0.5, 0, 0, ratio = 0}, - [302] = {0.5, 0, 0, ratio = 0}, - [4] = {0.5, 0, 0, ratio = 0}, - [5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [9] = {0.5, 0, 0, ratio = 0}, - [10] = {0.5, 0, 0, ratio = 0}, - [11] = {0.5, 0, 0, ratio = 0}, - [12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - [27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.5, 0, 0, ratio = 0}, - [22] = {0.5, 0, 0, ratio = 0}, - [23] = {0.5, 0, 0, ratio = 0}, - [24] = {0.5, 0, 0, ratio = 0}, - [25] = {0.5, 0, 0, ratio = 0}, - [26] = {0.5, 0, 0, ratio = 0}, - [28] = {0.5, 0, 0, ratio = 0}, - [29] = {0.5, 0, 0, ratio = 0}, - [30] = {0.5, 0, 0, ratio = 0}, - ]] - }, - end_adjust = {0.5, 0}, - }, - - [7] = { -- 読点類 - chars = {'、', - '，'}, -- 縦書きでは使わない - width = 0.5,height = 0.88,depth = 0.12, - align = 'left', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [22] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [23] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}}, - [28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [29] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - [30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, - ]] - }, - end_adjust = {0.5, 0}, - }, - - [8] = { -- 分離禁止文字 - chars = {'—', '…', '‥', '〳', '〴', '〵'}, - width = 1,height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, -- 空き注4 --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [9] = { -- 繰返し記号 - chars = {'ヽ', 'ヾ', 'ゝ', 'ゞ', '々', '〻'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [10] = { -- 長音記号 - chars = {'ー'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [11] = { -- 小書きの仮名 - chars = {'ぁ', 'ぃ', 'ぅ', 'ぇ', 'ぉ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'っ', 'ゃ', 'ゅ', 'ょ', 'ゎ', 'ゕ', 'ゖ', 'ッ', 'ャ', 'ュ', 'ョ', 'ヮ', 'ヵ', 'ヶ', 'ㇰ', 'ㇱ', 'ㇲ', 'ㇳ', 'ㇴ', 'ㇵ', 'ㇶ', 'ㇷ', 'ㇸ', 'ㇹ', 'ㇺ', 'ㇻ', 'ㇼ', 'ㇽ', 'ㇾ', 'ㇿ', 'ㇷ゚'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [12] = { -- 前置省略記号 - chars = {'￥', '＄', '￡', '＃', '€', '№'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0, 0, 0}, - [25] = {0, 0.25, 0, priority = {0,0}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [13] = { -- 後置省略記号 - chars = {'°', '′', '″', '℃', '￠', '％', '‰', '㏋', 'ℓ', '㌃', '㌍', '㌔', '㌘', '㌢', '㌣', '㌦', '㌧', '㌫', '㌶', '㌻', '㍉', '㍊', '㍍', '㍑', '㍗', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [27] = {0, 0.25, 0, priority = {0,0}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0, 0.25, 0, priority = {0,0}}, - [25] = {0, 0.25, 0, priority = {0,0}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [14] = { -- 和字間隔 - chars = {'　'}, - align = 'middle', - width= 1,height = 0.88,depth = 0.12, - glue = { - [1] = {0, stretch_width, 0, priority = {-1,0}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, stretch_width, 0, priority = {-1,0}}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, stretch_width, 0, priority = {-1,0}}, - [13] = {0, stretch_width, 0, priority = {-1,0}}, - [14] = {0, stretch_width, 0, priority = {-1,0}}, - [15] = {0, stretch_width, 0, priority = {-1,0}}, - [16] = {0, stretch_width, 0, priority = {-1,0}}, - [0] = {0, stretch_width, 0, priority = {-1,0}}, - [27] = {0, stretch_width, 0, priority = {-1,0}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0, 0, 0}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0}, - [30] = {0, 0, 0}, - ]] - }, - }, - - [15] = { -- 平仮名 - chars = {'あ', 'い', 'う', 'え', 'お', 'か', 'が', 'き', 'ぎ', 'く', 'ぐ', 'け', 'げ', 'こ', 'ご', 'さ', 'ざ', 'し', 'じ', 'す', 'ず', 'せ', 'ぜ', 'そ', 'ぞ', 'た', 'だ', 'ち', 'ぢ', 'つ', 'づ', 'て', 'で', 'と', 'ど', 'な', 'に', 'ぬ', 'ね', 'の', 'は', 'ば', 'ぱ', 'ひ', 'び', 'ぴ', 'ふ', 'ぶ', 'ぷ', 'へ', 'べ', 'ぺ', 'ほ', 'ぼ', 'ぽ', 'ま', 'み', 'む', 'め', 'も', 'や', 'ゆ', 'よ', 'ら', 'り', 'る', 'れ', 'ろ', 'わ', 'ゐ', 'ゑ', 'を', 'ん', 'ゔ', 'か゚', 'き゚', 'く゚', 'け゚', 'こ゚'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - ]] - --[[ - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - [16] = { -- 片仮名 - chars = {'ア', 'イ', 'ウ', 'エ', 'オ', 'カ', 'ガ', 'キ', 'ギ', 'ク', 'グ', 'ケ', 'ゲ', 'コ', 'ゴ', 'サ', 'ザ', 'シ', 'ジ', 'ス', 'ズ', 'セ', 'ゼ', 'ソ', 'ゾ', 'タ', 'ダ', 'チ', 'ヂ', 'ツ', 'ヅ', 'テ', 'デ', 'ト', 'ド', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'バ', 'パ', 'ヒ', 'ビ', 'ピ', 'フ', 'ブ', 'プ', 'ヘ', 'ベ', 'ペ', 'ホ', 'ボ', 'ポ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ヰ', 'ヱ', 'ヲ', 'ン', 'ヴ', 'ヷ', 'ヸ', 'ヹ', 'ヺ', 'カ゚', 'キ゚', 'ク゚', 'ケ゚', 'コ゚', 'セ゚', 'ツ゚', 'ト゚'}, - height = 0.88,depth = 0.12, - align = 'middle', - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - ]] - --[[ - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - --[[ - [17] = { -- 等号類 - chars = {'＝', '≠', '≒', '≃', '≅', '≈', '≡', '≢', '＜', '＞', '≦', '≧', '≪', '≫', '≶', '≷', '⋚', '⋛', '∧', '∨', '⌅', '⌆', '⊂', '⊃', '⊄', '⊅', '⊆', '⊇', '⊊', '⊋', '∈', '∋', '∉', '∪', '∩', '∥', '∦', '⇒', '⇔', '↔', '∽', '∝', '⊥', '⊕', '⊗'}, - align = 'middle', - width = 1, - }, - - [18] = { -- 演算記号 - chars = {'＋', '－', '×', '÷', '±', '∓'}, - align = 'middle', - width = 1, - }, - ]] - - -- [19] -- 漢字等：「その他の和文」として[0]で扱う - [0] = { -- = [19] - left = 0, - align = 'middle', - width = 1,height = 0.88,depth = 0.12, - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, --- [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0, 0.25, 0, priority = {0,0}}, --- [10] = {0, 0.25, 0, priority = {0,0}}, --- [11] = {0, 0.25, 0, priority = {0,0}}, --- [12] = {0, 0.25, 0, priority = {0,0}}, --- [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, --- [15] = {0, 0.25, 0, priority = {0,0}}, --- [16] = {0, 0.25, 0, priority = {0,0}}, --- [0] = {0, 0.25, 0, priority = {0,0}}, --- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - --[[ - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - ]] - }, - }, - - - --[[ - [20] = { -- 合印中の文字 - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0, 0.25, 0, priority = {0,0}}, - [10] = {0, 0.25, 0, priority = {0,0}}, - [11] = {0, 0.25, 0, priority = {0,0}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0, 0.25, 0, priority = {0,0}}, - [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0, 0.25, 0, priority = {0,0}}, - [25] = {0, 0.25, 0, priority = {0,0}}, - [26] = {0, 0, 0}, - [27] = {0, 0.25, 0, priority = {0,0}}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - }, - }, - - [21] = {-- 親文字群中の文字（添え字付き） - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [20] = {0, 0, 0}, - [21] = {0, 0, 0},-- 注9，空け注5 - [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [24] = {0, 0.25, 0, priority = {0,0}}, - [25] = {0, 0.25, 0, priority = {0,0}}, - [26] = {0, 0, 0}, - [27] = {0, 0.25, 0, priority = {0,0}}, - [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},表6と表3が整合的でない - [29] = {0, 0, 0}, - [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - }, - }, - - [22] = { -- 親文字群中の文字（熟語ルビ以外のルビ付き） - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0, 0.25, 0, priority = {0,0}}, - [10] = {0, 0.25, 0, priority = {0,0}}, - [11] = {0, 0.25, 0, priority = {0,0}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0, 0.25, 0, priority = {0,0}}, - [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, -- 空け注10 - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - }, - }, - - [23] = { -- 親文字群中の文字（熟語ルビ付き） - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0, 0.25, 0, priority = {0,0}}, - [10] = {0, 0.25, 0, priority = {0,0}}, - [11] = {0, 0.25, 0, priority = {0,0}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0, 0.25, 0, priority = {0,0}}, - [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}},-- 空け注7 - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [26] = {0, 0, 0}, - [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - }, - }, - - [24] = { -- 連数字中の文字 - chars = {' ', ',', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}, - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0, 0},-- 空け注8 - [14] = {0, 0, 0}, - [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [24] = {0, 0, 0}, - [25] = {0.25, 0, 0, ratio = 0}, - [26] = {0, 0, 0}, - [27] = {0, 0, 0},-- 空け注9 - [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [29] = {0, 0, 0}, - [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - } - }, - - [25] = { -- 単位記号中の文字 - chars = {' ', '(', ')', '/', '1', '2', '3', '4', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'Ω', 'μ', '℧', 'Å', '−', '・'}, - glue = { - [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},-- 注12 - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [27] = {0, 0, 0}, - [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [29] = {0, 0, 0}, - [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - } - }, - - [26] = { -- 欧文間隔 - chars = {' '}, - glue = { -- 表3の方には記述がないのは何故？ - [1] = {0.5, 0, 0.5, ratio = 1}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, - [9] = {0, 0, 0}, - [10] = {0, 0, 0}, - [11] = {0, 0, 0}, - [12] = {0, 0, 0}, - [13] = {0, 0, 0}, - [14] = {0, 0, 0}, - [15] = {0, 0, 0}, - [16] = {0, 0, 0}, - [0] = {0, 0, 0}, - [21] = {0, 0, 0}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, - [27] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0},-- 注13, （空け）注4 - [30] = {0, 0, 0}, - } - }, -]] - [27] = {-- 欧文 - chars = {'alchar'}, - glue = { - [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, - [2] = {0, 0, 0}, - [300] = {0, 0, 0}, - [301] = {0, 0, 0}, - [302] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, --- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}},-- 空け注10 - [14] = {0, 0, 0}, --- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, --- [27] = {0, 0, 0, ratio = 0, priority = {1,0}}, ---[[ - [20] = {0, 0, 0}, - [21] = {0, 0.25, 0, priority = {0,0}}, - [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [24] = {0, 0, 0}, - [25] = {0.25, 0, 0.125, ratio = 0, priority = {0,-1}}, - [26] = {0, 0, 0}, - [27] = {0, 0, 0}, - [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, - [29] = {0, 0, 0}, - [30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, ---]] - } - }, ---[[ - [28] = { -- 割注始め括弧類 - chars = {'（', '〔', '［'}, - glue = { - [1] = {0, 0, 0}, - [2] = {0, 0, 0}, - [3] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0, 0, 0}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0, 0}, - [9] = {0, 0, 0},-- 注14 - [10] = {0, 0, 0},-- 注15 - [11] = {0, 0, 0},-- 注16 - [12] = {0, 0, 0}, - [13] = {0, 0, 0}, - [14] = {0, 0, 0}, - [15] = {0, 0, 0}, - [16] = {0, 0, 0}, - [0] = {0, 0, 0}, - [20] = {0, 0, 0}, - [21] = {0, 0, 0}, - [22] = {0, 0, 0}, - [23] = {0, 0, 0}, - [24] = {0, 0, 0}, - [25] = {0, 0, 0}, - [26] = {0, 0, 0}, -- 注13, （空け）注4 - [27] = {0, 0, 0}, - [28] = {0, 0, 0}, - [29] = {0, 0, 0}, - [30] = {0, 0, 0}, - } - }, - - [29] = { -- 割注終わり括弧類 - chars = {'）', '〕', '］'}, - glue = { - [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [3] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0, 0.25, 0, priority = {0,0}}, - [10] = {0, 0.25, 0, priority = {0,0}}, - [11] = {0, 0.25, 0, priority = {0,0}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0, 0.25, 0, priority = {0,0}}, - [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3}, - [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [26] = {0, 0, 0}, - [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - } - }, - - [30] = { -- 縦中横中の文字 - glue = { - [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, - [2] = {0, 0, 0}, - [3] = {0, 0, 0}, - [4] = {0, 0, 0}, - [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, - [6] = {0, 0, 0}, - [7] = {0, 0, 0}, - [8] = {0, 0.25, 0, priority = {0,0}}, - [9] = {0, 0.25, 0, priority = {0,0}}, - [10] = {0, 0.25, 0, priority = {0,0}}, - [11] = {0, 0.25, 0, priority = {0,0}}, - [12] = {0, 0.25, 0, priority = {0,0}}, - [13] = {0, 0.25, 0, priority = {0,0}}, - [14] = {0, 0, 0}, - [15] = {0, 0.25, 0, priority = {0,0}}, - [16] = {0, 0.25, 0, priority = {0,0}}, - [0] = {0, 0.25, 0, priority = {0,0}}, - [20] = {0, 0, 0}, - [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [22] = {0, 0.25, 0, priority = {0,0}}, - [23] = {0, 0.25, 0, priority = {0,0}}, - [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3}, - [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [26] = {0, 0, 0}, - [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, - [28] = {0, 0.25, 0, priority = {0,0}}, - [29] = {0, 0, 0}, - [30] = {0, 0.25, 0, priority = {0,0}}, - } - }, - ]] - - [90] = { -- 行頭 - chars = {'parbdd','boxbdd'}, - glue = { - [1] = {0, 0, 0}, -- 行頭括弧はベタ組 - }, - }, -} - -local function add_space(before,after,glueorkern,space,ratio) - if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end - if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end - local origratio = jfm[before][glueorkern][after].ratio - if origratio == nil then origratio = 0.5 end - jfm[before][glueorkern][after].ratio = (jfm[before][glueorkern][after][1] * origratio + space * ratio) / (jfm[before][glueorkern][after][1] + ratio) - jfm[before][glueorkern][after][1] = jfm[before][glueorkern][after][1] + space -end - -if jlreq ~= nil then - if type(jlreq.open_bracket_pos) == "string" then - local r = jlreq.open_bracket_pos:find("_") - local danraku = jlreq.open_bracket_pos:sub(1,r - 1) - local orikaeshi = jlreq.open_bracket_pos:sub(r + 1) - - -- 折り返し行頭の開き括弧を二分下げる……つもり - if orikaeshi == "nibu" then - -- widthを二分増やし，その代わりJFMグルーを二分減らす - jfm[1].width = jfm[1].width + 0.5 - for k,v in pairs(jfm) do - if type(k) == "number" then - add_space(k,1,"glue",-0.5,1) - end - end - end - - -- 段落行頭の下げ - if danraku == "zenkakunibu" then - add_space(90,1,"glue",0.5,1) - elseif danraku == "nibu" then - add_space(90,1,"glue",-0.5,1) - end - end - - -- ぶら下げ組を有効にする． - if jlreq.burasage == true then - for _,class in ipairs({6,7}) do - table.insert(jfm[class].end_adjust,-0.5) - end - end -end - - -luatexja.jfont.define_jfm(jfm) +--[[ +3.1.3 +3.1.6.a +]] + +--[[ +優先順位は，第n段階を3 - nに対応させる． + 段階 1, 2, 3, 4, 5, 6 +priority 2, 1, 0,-1,-2,-3 +xkanjiskipは{1,-3},kanjiskip={0,0} +\ltjsetparameter{stretch_priority={kanjiskip=1,xkanjiskip=-3}} +\ltjsetparameter{stretch_priority={kanjiskip=0,xkanjiskip=0}} +]] + +local stretch_width = 0.25 -- 空き第四段階の空き量 + +local hyphen_glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, + [9] = {0, 0, 0}, + [10] = {0, 0, 0}, + [11] = {0, 0, 0}, + [12] = {0, stretch_width, 0, priority = {-1,0}}, + [13] = {0, stretch_width, 0, priority = {-1,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, + [15] = {0, stretch_width, 0, priority = {-1,0}}, + [16] = {0, stretch_width, 0, priority = {-1,0}}, + [0] = {0, stretch_width, 0, priority = {-1,0}}, + [27] = {0, stretch_width, 0, priority = {-1,0}}, +--[[ + [20] = {0, 0, 0}, + [21] = {0, 0, 0}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0}, + [30] = {0, 0, 0}, +]] +} + +local jfm = { + dir = 'yoko', + zw = 1.0, + zh = 1.0, + version = 3, + -- 文字クラス4,9,10,11,15,16,19との間は(x)kanjiskipで調整する． + kanjiskip = {0, 0.25, 0}, + xkanjiskip = {0.25, 0.25, 0.125}, + + -- alignは適当 + [1] = { -- 初め括弧類 + chars = {'（', '〔', '［', '｛', '〈', '《', '「', '『', '【', '｟', '〘', '〖', '«', '〝', + '‘', '“'}, + width = 0.5,height = 0.88,depth = 0.12, + align = 'right', + glue = { + [1] = {0, 0, 0}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0, 0}, + [9] = {0, 0, 0}, + [10] = {0, 0, 0}, + [11] = {0, 0, 0}, + [12] = {0, 0, 0}, + [13] = {0, 0, 0}, + [14] = {0, 0, 0}, + [15] = {0, 0, 0}, + [16] = {0, 0, 0}, + [0] = {0, 0, 0}, + [27] = {0, 0, 0}, +--[[ + [20] = {0, 0, 0}, + [21] = {0, 0, 0}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0}, + [30] = {0, 0, 0}, + -- [22][23] 注1 + ]] + }, + }, + + [2] = { -- 終わり括弧類 + chars = { '）', '〕', '］', '｝', '〉', '》', '」', '』', '】', '｠', '〙', '〗', '»', '〟', + '’', '”'}, + width = 0.5,height = 0.88,depth = 0.12, + align = 'left', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, + [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [22] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [23] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}}, + [28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [29] = {0, 0, 0}, + [30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + ]] + }, + end_adjust = {0.5,0}, + }, + + -- [3*]はハイフン類．幅が違うので分ける． + [300] = { + chars = {'‐'}, + width = 0.25,height = 0.88,depth = 0.12, + align = 'middle', + glue = hyphen_glue,-- 上の方で定義 + }, + + [301] = { + chars = {'゠', '–'}, + width = 0.5,height = 0.88,depth = 0.12, + align = 'middle', + glue = hyphen_glue, + }, + + [302] = { + chars = {'〜'}, + width = 1,height = 0.88,depth = 0.12, + align = 'middle', + glue = hyphen_glue, + }, + + [4] = { -- 区切り約物 + chars = {'！', '？', '‼', '⁇', '⁈', '⁉'}, + width = 1,height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, stretch_width, 0.25, ratio = 1, priority = {-1,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, + [9] = {0, 0, 0}, + [10] = {0, 0, 0}, + [11] = {0, 0, 0}, + [12] = {0, stretch_width, 0, priority = {-1,0}}, + [13] = {0, stretch_width, 0, priority = {-1,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, + [15] = {0, stretch_width, 0, priority = {-1,0}}, + [16] = {0, stretch_width, 0, priority = {-1,0}}, + [0] = {0, stretch_width, 0, priority = {-1,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0}, + [30] = {0, 0, 0}, + ]] + }, + }, + + [5] = { -- 中点類 + chars = {'・', '：', + '；' + }, + width = 0.5,height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [2] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [300] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [301] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [302] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [4] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [5] = {0.5, 0, 0.5, ratio = 0.5, priority = {0,-1}}, + [6] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [7] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [8] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [9] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [10] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [11] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [12] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [13] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [14] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [15] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [16] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [0] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + [27] = {0.25, stretch_width, 0.25, ratio = 0, priority = {-1,-1}}, + --[[ + [20] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [21] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [22] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [23] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [24] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [25] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [26] = {0.25, 0, 0, ratio = 0, priority = {0,-1}}, + [28] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [29] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + [30] = {0.25, 0, 0.25, ratio = 0, priority = {0,-1}}, + ]] + }, + end_adjust = {0.25,0}, -- 0.25 -> 0は詰め，優先順位は第三段階 + }, + + [6] = { -- 句点類 + chars = {'。', + '．'}, -- 縦書きでは使わない + width = 0.5,height = 0.88,depth = 0.12, + align = 'left', + glue = { + [1] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [2] = {0, 0, 0}, + [300] = {0.5, 0, 0, ratio = 0}, + [301] = {0.5, 0, 0, ratio = 0}, + [302] = {0.5, 0, 0, ratio = 0}, + [4] = {0.5, 0, 0, ratio = 0}, + [5] = {0.75, 0, 0.25, ratio = 0.33333333, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [9] = {0.5, 0, 0, ratio = 0}, + [10] = {0.5, 0, 0, ratio = 0}, + [11] = {0.5, 0, 0, ratio = 0}, + [12] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [13] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [14] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [15] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [16] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [0] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + [27] = {0.5, stretch_width, 0, ratio = 0, priority = {-1,0}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.5, 0, 0, ratio = 0}, + [22] = {0.5, 0, 0, ratio = 0}, + [23] = {0.5, 0, 0, ratio = 0}, + [24] = {0.5, 0, 0, ratio = 0}, + [25] = {0.5, 0, 0, ratio = 0}, + [26] = {0.5, 0, 0, ratio = 0}, + [28] = {0.5, 0, 0, ratio = 0}, + [29] = {0.5, 0, 0, ratio = 0}, + [30] = {0.5, 0, 0, ratio = 0}, + ]] + }, + end_adjust = {0.5, 0}, + }, + + [7] = { -- 読点類 + chars = {'、', + '，'}, -- 縦書きでは使わない + width = 0.5,height = 0.88,depth = 0.12, + align = 'left', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [301] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [302] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [4] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [5] = {0.75, 0, 0.75, ratio = 0.33333333, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [9] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [10] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [11] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [12] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [13] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [14] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [15] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [16] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [0] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + [27] = {0.5, stretch_width, 0.5, ratio = 0, priority = {-1,-2}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [22] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [23] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [24] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [25] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [26] = {0.5, 0, 0, ratio = 0, priority = {0,-2}}, + [28] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [29] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + [30] = {0.5, 0, 0.5, ratio = 0, priority = {0,-2}}, + ]] + }, + end_adjust = {0.5, 0}, + }, + + [8] = { -- 分離禁止文字 + chars = {'—', '…', '‥', '〳', '〴', '〵'}, + width = 1,height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0, 0}, -- 空き注4 +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [27] = {0, 0.25, 0, priority = {0,0}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [9] = { -- 繰返し記号 + chars = {'ヽ', 'ヾ', 'ゝ', 'ゞ', '々', '〻'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [10] = { -- 長音記号 + chars = {'ー'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [11] = { -- 小書きの仮名 + chars = {'ぁ', 'ぃ', 'ぅ', 'ぇ', 'ぉ', 'ァ', 'ィ', 'ゥ', 'ェ', 'ォ', 'っ', 'ゃ', 'ゅ', 'ょ', 'ゎ', 'ゕ', 'ゖ', 'ッ', 'ャ', 'ュ', 'ョ', 'ヮ', 'ヵ', 'ヶ', 'ㇰ', 'ㇱ', 'ㇲ', 'ㇳ', 'ㇴ', 'ㇵ', 'ㇶ', 'ㇷ', 'ㇸ', 'ㇹ', 'ㇺ', 'ㇻ', 'ㇼ', 'ㇽ', 'ㇾ', 'ㇿ', 'ㇷ゚'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [12] = { -- 前置省略記号 + chars = {'￥', '＄', '￡', '＃', '€', '№'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, +-- [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [27] = {0, 0.25, 0, priority = {0,0}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0, 0, 0}, + [25] = {0, 0.25, 0, priority = {0,0}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [13] = { -- 後置省略記号 + chars = {'°', '′', '″', '℃', '￠', '％', '‰', '㏋', 'ℓ', '㌃', '㌍', '㌔', '㌘', '㌢', '㌣', '㌦', '㌧', '㌫', '㌶', '㌻', '㍉', '㍊', '㍍', '㍑', '㍗', '㎎', '㎏', '㎜', '㎝', '㎞', '㎡', '㏄'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, +-- [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [27] = {0, 0.25, 0, priority = {0,0}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0, 0.25, 0, priority = {0,0}}, + [25] = {0, 0.25, 0, priority = {0,0}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [14] = { -- 和字間隔 + chars = {'　'}, + align = 'middle', + width= 1,height = 0.88,depth = 0.12, + glue = { + [1] = {0, stretch_width, 0, priority = {-1,0}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, stretch_width, 0, priority = {-1,0}}, + [9] = {0, 0, 0}, + [10] = {0, 0, 0}, + [11] = {0, 0, 0}, + [12] = {0, stretch_width, 0, priority = {-1,0}}, + [13] = {0, stretch_width, 0, priority = {-1,0}}, + [14] = {0, stretch_width, 0, priority = {-1,0}}, + [15] = {0, stretch_width, 0, priority = {-1,0}}, + [16] = {0, stretch_width, 0, priority = {-1,0}}, + [0] = {0, stretch_width, 0, priority = {-1,0}}, + [27] = {0, stretch_width, 0, priority = {-1,0}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0, 0, 0}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0}, + [30] = {0, 0, 0}, + ]] + }, + }, + + [15] = { -- 平仮名 + chars = {'あ', 'い', 'う', 'え', 'お', 'か', 'が', 'き', 'ぎ', 'く', 'ぐ', 'け', 'げ', 'こ', 'ご', 'さ', 'ざ', 'し', 'じ', 'す', 'ず', 'せ', 'ぜ', 'そ', 'ぞ', 'た', 'だ', 'ち', 'ぢ', 'つ', 'づ', 'て', 'で', 'と', 'ど', 'な', 'に', 'ぬ', 'ね', 'の', 'は', 'ば', 'ぱ', 'ひ', 'び', 'ぴ', 'ふ', 'ぶ', 'ぷ', 'へ', 'べ', 'ぺ', 'ほ', 'ぼ', 'ぽ', 'ま', 'み', 'む', 'め', 'も', 'や', 'ゆ', 'よ', 'ら', 'り', 'る', 'れ', 'ろ', 'わ', 'ゐ', 'ゑ', 'を', 'ん', 'ゔ', 'か゚', 'き゚', 'く゚', 'け゚', 'こ゚'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, +-- [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + ]] + --[[ + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + [16] = { -- 片仮名 + chars = {'ア', 'イ', 'ウ', 'エ', 'オ', 'カ', 'ガ', 'キ', 'ギ', 'ク', 'グ', 'ケ', 'ゲ', 'コ', 'ゴ', 'サ', 'ザ', 'シ', 'ジ', 'ス', 'ズ', 'セ', 'ゼ', 'ソ', 'ゾ', 'タ', 'ダ', 'チ', 'ヂ', 'ツ', 'ヅ', 'テ', 'デ', 'ト', 'ド', 'ナ', 'ニ', 'ヌ', 'ネ', 'ノ', 'ハ', 'バ', 'パ', 'ヒ', 'ビ', 'ピ', 'フ', 'ブ', 'プ', 'ヘ', 'ベ', 'ペ', 'ホ', 'ボ', 'ポ', 'マ', 'ミ', 'ム', 'メ', 'モ', 'ヤ', 'ユ', 'ヨ', 'ラ', 'リ', 'ル', 'レ', 'ロ', 'ワ', 'ヰ', 'ヱ', 'ヲ', 'ン', 'ヴ', 'ヷ', 'ヸ', 'ヹ', 'ヺ', 'カ゚', 'キ゚', 'ク゚', 'ケ゚', 'コ゚', 'セ゚', 'ツ゚', 'ト゚'}, + height = 0.88,depth = 0.12, + align = 'middle', + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, +-- [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + ]] + --[[ + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + --[[ + [17] = { -- 等号類 + chars = {'＝', '≠', '≒', '≃', '≅', '≈', '≡', '≢', '＜', '＞', '≦', '≧', '≪', '≫', '≶', '≷', '⋚', '⋛', '∧', '∨', '⌅', '⌆', '⊂', '⊃', '⊄', '⊅', '⊆', '⊇', '⊊', '⊋', '∈', '∋', '∉', '∪', '∩', '∥', '∦', '⇒', '⇔', '↔', '∽', '∝', '⊥', '⊕', '⊗'}, + align = 'middle', + width = 1, + }, + + [18] = { -- 演算記号 + chars = {'＋', '－', '×', '÷', '±', '∓'}, + align = 'middle', + width = 1, + }, + ]] + + -- [19] -- 漢字等：「その他の和文」として[0]で扱う + [0] = { -- = [19] + left = 0, + align = 'middle', + width = 1,height = 0.88,depth = 0.12, + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, +-- [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0, 0.25, 0, priority = {0,0}}, +-- [10] = {0, 0.25, 0, priority = {0,0}}, +-- [11] = {0, 0.25, 0, priority = {0,0}}, +-- [12] = {0, 0.25, 0, priority = {0,0}}, +-- [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, +-- [15] = {0, 0.25, 0, priority = {0,0}}, +-- [16] = {0, 0.25, 0, priority = {0,0}}, +-- [0] = {0, 0.25, 0, priority = {0,0}}, +-- [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + --[[ + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + ]] + }, + }, + + + --[[ + [20] = { -- 合印中の文字 + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0, 0.25, 0, priority = {0,0}}, + [10] = {0, 0.25, 0, priority = {0,0}}, + [11] = {0, 0.25, 0, priority = {0,0}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0, 0.25, 0, priority = {0,0}}, + [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0, 0.25, 0, priority = {0,0}}, + [25] = {0, 0.25, 0, priority = {0,0}}, + [26] = {0, 0, 0}, + [27] = {0, 0.25, 0, priority = {0,0}}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + }, + }, + + [21] = {-- 親文字群中の文字（添え字付き） + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [20] = {0, 0, 0}, + [21] = {0, 0, 0},-- 注9，空け注5 + [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [24] = {0, 0.25, 0, priority = {0,0}}, + [25] = {0, 0.25, 0, priority = {0,0}}, + [26] = {0, 0, 0}, + [27] = {0, 0.25, 0, priority = {0,0}}, + [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}},表6と表3が整合的でない + [29] = {0, 0, 0}, + [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + }, + }, + + [22] = { -- 親文字群中の文字（熟語ルビ以外のルビ付き） + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0, 0.25, 0, priority = {0,0}}, + [10] = {0, 0.25, 0, priority = {0,0}}, + [11] = {0, 0.25, 0, priority = {0,0}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0, 0.25, 0, priority = {0,0}}, + [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, -- 空け注10 + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + }, + }, + + [23] = { -- 親文字群中の文字（熟語ルビ付き） + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0, 0.25, 0, priority = {0,0}}, + [10] = {0, 0.25, 0, priority = {0,0}}, + [11] = {0, 0.25, 0, priority = {0,0}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0, 0.25, 0, priority = {0,0}}, + [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}},-- 空け注7 + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [26] = {0, 0, 0}, + [27] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + }, + }, + + [24] = { -- 連数字中の文字 + chars = {' ', ',', '.', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9'}, + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0, 0},-- 空け注8 + [14] = {0, 0, 0}, + [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [24] = {0, 0, 0}, + [25] = {0.25, 0, 0, ratio = 0}, + [26] = {0, 0, 0}, + [27] = {0, 0, 0},-- 空け注9 + [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [29] = {0, 0, 0}, + [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + } + }, + + [25] = { -- 単位記号中の文字 + chars = {' ', '(', ')', '/', '1', '2', '3', '4', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'Ω', 'μ', '℧', 'Å', '−', '・'}, + glue = { + [1] = {0,5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}},-- 注12 + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [24] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [27] = {0, 0, 0}, + [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [29] = {0, 0, 0}, + [30] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + } + }, + + [26] = { -- 欧文間隔 + chars = {' '}, + glue = { -- 表3の方には記述がないのは何故？ + [1] = {0.5, 0, 0.5, ratio = 1}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0, 0}, + [9] = {0, 0, 0}, + [10] = {0, 0, 0}, + [11] = {0, 0, 0}, + [12] = {0, 0, 0}, + [13] = {0, 0, 0}, + [14] = {0, 0, 0}, + [15] = {0, 0, 0}, + [16] = {0, 0, 0}, + [0] = {0, 0, 0}, + [21] = {0, 0, 0}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, + [27] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0},-- 注13, （空け）注4 + [30] = {0, 0, 0}, + } + }, +]] + [27] = {-- 欧文 + chars = {'alchar'}, + glue = { + [1] = {0.5, stretch_width, 0.5, ratio = 1, priority = {-1,-2}}, + [2] = {0, 0, 0}, + [300] = {0, 0, 0}, + [301] = {0, 0, 0}, + [302] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, +-- [9] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, +-- [10] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, +-- [11] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}},-- 空け注10 + [14] = {0, 0, 0}, +-- [15] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, +-- [16] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, +-- [0] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, +-- [27] = {0, 0, 0, ratio = 0, priority = {1,0}}, +--[[ + [20] = {0, 0, 0}, + [21] = {0, 0.25, 0, priority = {0,0}}, + [22] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [23] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [24] = {0, 0, 0}, + [25] = {0.25, 0, 0.125, ratio = 0, priority = {0,-1}}, + [26] = {0, 0, 0}, + [27] = {0, 0, 0}, + [28] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, + [29] = {0, 0, 0}, + [30] = {0.25, 0.25, 0.125, ratio = 0, priority = {1,-3}}, +--]] + } + }, +--[[ + [28] = { -- 割注始め括弧類 + chars = {'（', '〔', '［'}, + glue = { + [1] = {0, 0, 0}, + [2] = {0, 0, 0}, + [3] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0, 0, 0}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0, 0}, + [9] = {0, 0, 0},-- 注14 + [10] = {0, 0, 0},-- 注15 + [11] = {0, 0, 0},-- 注16 + [12] = {0, 0, 0}, + [13] = {0, 0, 0}, + [14] = {0, 0, 0}, + [15] = {0, 0, 0}, + [16] = {0, 0, 0}, + [0] = {0, 0, 0}, + [20] = {0, 0, 0}, + [21] = {0, 0, 0}, + [22] = {0, 0, 0}, + [23] = {0, 0, 0}, + [24] = {0, 0, 0}, + [25] = {0, 0, 0}, + [26] = {0, 0, 0}, -- 注13, （空け）注4 + [27] = {0, 0, 0}, + [28] = {0, 0, 0}, + [29] = {0, 0, 0}, + [30] = {0, 0, 0}, + } + }, + + [29] = { -- 割注終わり括弧類 + chars = {'）', '〕', '］'}, + glue = { + [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [3] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0, 0.25, 0, priority = {0,0}}, + [10] = {0, 0.25, 0, priority = {0,0}}, + [11] = {0, 0.25, 0, priority = {0,0}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0, 0.25, 0, priority = {0,0}}, + [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3}, + [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [26] = {0, 0, 0}, + [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + } + }, + + [30] = { -- 縦中横中の文字 + glue = { + [1] = {0.5, 0, 0.5, ratio = 1, priority = {0,-2}}, + [2] = {0, 0, 0}, + [3] = {0, 0, 0}, + [4] = {0, 0, 0}, + [5] = {0.25, 0, 0.25, ratio = 1, priority = {0,-1}}, + [6] = {0, 0, 0}, + [7] = {0, 0, 0}, + [8] = {0, 0.25, 0, priority = {0,0}}, + [9] = {0, 0.25, 0, priority = {0,0}}, + [10] = {0, 0.25, 0, priority = {0,0}}, + [11] = {0, 0.25, 0, priority = {0,0}}, + [12] = {0, 0.25, 0, priority = {0,0}}, + [13] = {0, 0.25, 0, priority = {0,0}}, + [14] = {0, 0, 0}, + [15] = {0, 0.25, 0, priority = {0,0}}, + [16] = {0, 0.25, 0, priority = {0,0}}, + [0] = {0, 0.25, 0, priority = {0,0}}, + [20] = {0, 0, 0}, + [21] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [22] = {0, 0.25, 0, priority = {0,0}}, + [23] = {0, 0.25, 0, priority = {0,0}}, + [24] = {0.25, 0.25, 0.125, ratio = 1}, priority = {1,-3}, + [25] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [26] = {0, 0, 0}, + [27] = {0.25, 0.25, 0.125, ratio = 1, priority = {1,-3}}, + [28] = {0, 0.25, 0, priority = {0,0}}, + [29] = {0, 0, 0}, + [30] = {0, 0.25, 0, priority = {0,0}}, + } + }, + ]] + + [90] = { -- 行頭 + chars = {'parbdd','boxbdd'}, + glue = { + [1] = {0, 0, 0}, -- 行頭括弧はベタ組 + }, + }, +} + +local function add_space(before,after,glueorkern,space,ratio) + if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end + if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end + local origratio = jfm[before][glueorkern][after].ratio + if origratio == nil then origratio = 0.5 end + jfm[before][glueorkern][after].ratio = (jfm[before][glueorkern][after][1] * origratio + space * ratio) / (jfm[before][glueorkern][after][1] + ratio) + jfm[before][glueorkern][after][1] = jfm[before][glueorkern][after][1] + space +end + +if jlreq ~= nil then + if type(jlreq.open_bracket_pos) == "string" then + local r = jlreq.open_bracket_pos:find("_") + local danraku = jlreq.open_bracket_pos:sub(1,r - 1) + local orikaeshi = jlreq.open_bracket_pos:sub(r + 1) + + -- 折り返し行頭の開き括弧を二分下げる……つもり + if orikaeshi == "nibu" then + -- widthを二分増やし，その代わりJFMグルーを二分減らす + jfm[1].width = jfm[1].width + 0.5 + for k,v in pairs(jfm) do + if type(k) == "number" then + add_space(k,1,"glue",-0.5,1) + end + end + end + + -- 段落行頭の下げ + if danraku == "zenkakunibu" then + add_space(90,1,"glue",0.5,1) + elseif danraku == "nibu" then + add_space(90,1,"glue",-0.5,1) + end + end + + -- ぶら下げ組を有効にする． + if jlreq.burasage == true then + for _,class in ipairs({6,7}) do + table.insert(jfm[class].end_adjust,-0.5) + end + end +end + + +luatexja.jfont.define_jfm(jfm) diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua texlive-lang-2018.20180824/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2017-12-22 21:23:18.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/jlreq/jfm-jlreqv.lua 2018-08-08 21:05:58.000000000 +0000 @@ -1,1423 +1,1423 @@ -local jfm={ - [0]={ - ["align"]="middle", - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["left"]=0, - ["width"]=1, - }, - { - ["align"]="right", - ["chars"]={ "（", "〔", "［", "｛", "〈", "《", "「", "『", "【", "｟", "〘", "〖", "«", "〝", "‘", "“" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ 0, 0, 0 }, - { 0, 0, 0 }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ 0, 0, 0 }, - [13]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [15]={ 0, 0, 0 }, - [16]={ 0, 0, 0 }, - [27]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - { - ["align"]="left", - ["chars"]={ "）", "〕", "］", "｝", "〉", "》", "」", "』", "】", "｠", "〙", "〗", "»", "〟", "’", "”" }, - ["depth"]=0.5, - ["end_adjust"]={ 0.5, 0 }, - ["glue"]={ - [0]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - { 0, 0, 0 }, - [4]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [9]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [10]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [11]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [12]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [13]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [16]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [27]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [300]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [301]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [302]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - [4]={ - ["align"]="middle", - ["chars"]={ "！", "？", "‼", "⁇", "⁈", "⁉" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [16]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=1, - }, - [5]={ - ["align"]="middle", - ["chars"]={ "・", "：", "；" }, - ["depth"]=0.5, - ["end_adjust"]={ 0.25, 0 }, - ["glue"]={ - [0]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - { - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - { - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [4]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [5]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -1 }, - ["ratio"]=0.5, - }, - [6]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [7]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [8]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [9]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [10]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [11]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [12]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [13]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [14]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [15]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [16]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [27]={ - 0.25, - 0.25, - 0.25, - ["priority"]={ -1, -1 }, - ["ratio"]=0, - }, - [300]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [301]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - [302]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0, - }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - [6]={ - ["align"]="left", - ["chars"]={ "。", "．" }, - ["depth"]=0.5, - ["end_adjust"]={ 0.5, 0 }, - ["glue"]={ - [0]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - { - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - { 0, 0, 0 }, - [4]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [5]={ - 0.75, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=0.33333333, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [9]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [10]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [11]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [12]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [13]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [14]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [15]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [16]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [27]={ - 0.5, - 0.25, - 0, - ["priority"]={ -1, 0 }, - ["ratio"]=0, - }, - [300]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [301]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - [302]={ - 0.5, - 0, - 0, - ["ratio"]=0, - }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - [7]={ - ["align"]="left", - ["chars"]={ "、", "，" }, - ["depth"]=0.5, - ["end_adjust"]={ 0.5, 0 }, - ["glue"]={ - [0]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - { 0, 0, 0 }, - [4]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [5]={ - 0.75, - 0, - 0.75, - ["priority"]={ 0, -1 }, - ["ratio"]=0.33333333, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [9]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [10]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [11]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [12]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [13]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [14]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [15]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [16]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [27]={ - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=0, - }, - [300]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [301]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - [302]={ - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=0, - }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - [8]={ - ["align"]="middle", - ["chars"]={ "—", "…", "‥", "〳", "〴", "〵" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=1, - }, - [9]={ - ["align"]="middle", - ["chars"]={ "ヽ", "ヾ", "ゝ", "ゞ", "々", "〻" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [10]={ - ["align"]="middle", - ["chars"]={ "ー" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [11]={ - ["align"]="middle", - ["chars"]={ "ぁ", "ぃ", "ぅ", "ぇ", "ぉ", "ァ", "ィ", "ゥ", "ェ", "ォ", "っ", "ゃ", "ゅ", "ょ", "ゎ", "ゕ", "ゖ", "ッ", "ャ", "ュ", "ョ", "ヮ", "ヵ", "ヶ", "ㇰ", "ㇱ", "ㇲ", "ㇳ", "ㇴ", "ㇵ", "ㇶ", "ㇷ", "ㇸ", "ㇹ", "ㇺ", "ㇻ", "ㇼ", "ㇽ", "ㇾ", "ㇿ", "ㇷ゚" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [12]={ - ["align"]="middle", - ["chars"]={ "￥", "＄", "￡", "＃", "€", "№" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - { - 0.5, - 0, - 0.5, - ["priority"]={ 0, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [13]={ - ["align"]="middle", - ["chars"]={ "°", "′", "″", "℃", "￠", "％", "‰", "㏋", "ℓ", "㌃", "㌍", "㌔", "㌘", "㌢", "㌣", "㌦", "㌧", "㌫", "㌶", "㌻", "㍉", "㍊", "㍍", "㍑", "㍗", "㎎", "㎏", "㎜", "㎝", "㎞", "㎡", "㏄" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [14]={ - ["align"]="middle", - ["chars"]={ "　" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [16]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=1, - }, - [15]={ - ["align"]="middle", - ["chars"]={ "あ", "い", "う", "え", "お", "か", "が", "き", "ぎ", "く", "ぐ", "け", "げ", "こ", "ご", "さ", "ざ", "し", "じ", "す", "ず", "せ", "ぜ", "そ", "ぞ", "た", "だ", "ち", "ぢ", "つ", "づ", "て", "で", "と", "ど", "な", "に", "ぬ", "ね", "の", "は", "ば", "ぱ", "ひ", "び", "ぴ", "ふ", "ぶ", "ぷ", "へ", "べ", "ぺ", "ほ", "ぼ", "ぽ", "ま", "み", "む", "め", "も", "や", "ゆ", "よ", "ら", "り", "る", "れ", "ろ", "わ", "ゐ", "ゑ", "を", "ん", "ゔ", "か゚", "き゚", "く゚", "け゚", "こ゚" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [16]={ - ["align"]="middle", - ["chars"]={ "ア", "イ", "ウ", "エ", "オ", "カ", "ガ", "キ", "ギ", "ク", "グ", "ケ", "ゲ", "コ", "ゴ", "サ", "ザ", "シ", "ジ", "ス", "ズ", "セ", "ゼ", "ソ", "ゾ", "タ", "ダ", "チ", "ヂ", "ツ", "ヅ", "テ", "デ", "ト", "ド", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", "バ", "パ", "ヒ", "ビ", "ピ", "フ", "ブ", "プ", "ヘ", "ベ", "ペ", "ホ", "ボ", "ポ", "マ", "ミ", "ム", "メ", "モ", "ヤ", "ユ", "ヨ", "ラ", "リ", "ル", "レ", "ロ", "ワ", "ヰ", "ヱ", "ヲ", "ン", "ヴ", "ヷ", "ヸ", "ヹ", "ヺ", "カ゚", "キ゚", "ク゚", "ケ゚", "コ゚", "セ゚", "ツ゚", "ト゚" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [27]={ - ["chars"]={ "alchar" }, - ["depth"]=0.5, - ["glue"]={ - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ 0, 0 }, - }, - [14]={ 0, 0, 0 }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [90]={ - ["chars"]={ "parbdd", "boxbdd" }, - ["depth"]=0.5, - ["glue"]={ - { 0, 0, 0 }, - }, - ["height"]=0.5, - }, - [300]={ - ["align"]="middle", - ["chars"]={ "‐" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [16]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=0.25, - }, - [301]={ - ["align"]="middle", - ["chars"]={ "゠", "–" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [16]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=0.5, - }, - [302]={ - ["align"]="middle", - ["chars"]={ "〜" }, - ["depth"]=0.5, - ["glue"]={ - [0]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - { - 0.5, - 0.25, - 0.5, - ["priority"]={ -1, -2 }, - ["ratio"]=1, - }, - { 0, 0, 0 }, - [4]={ 0, 0, 0 }, - [5]={ - 0.25, - 0, - 0.25, - ["priority"]={ 0, -1 }, - ["ratio"]=1, - }, - [6]={ 0, 0, 0 }, - [7]={ 0, 0, 0 }, - [8]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [9]={ 0, 0, 0 }, - [10]={ 0, 0, 0 }, - [11]={ 0, 0, 0 }, - [12]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [13]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [14]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [15]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [16]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [27]={ - 0, - 0.25, - 0, - ["priority"]={ -1, 0 }, - }, - [300]={ 0, 0, 0 }, - [301]={ 0, 0, 0 }, - [302]={ 0, 0, 0 }, - }, - ["height"]=0.5, - ["width"]=1, - }, - ["dir"]="tate", - ["kanjiskip"]={ 0, 0.25, 0 }, - ["version"]=3, - ["xkanjiskip"]={ 0.25, 0.25, 0.125 }, - ["zh"]=1, - ["zw"]=1, -} -local function add_space(before,after,glueorkern,space,ratio) - if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end - if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end - local origratio = jfm[before][glueorkern][after].ratio - if origratio == nil then origratio = 0.5 end - jfm[before][glueorkern][after].ratio = (jfm[before][glueorkern][after][1] * origratio + space * ratio) / (jfm[before][glueorkern][after][1] + ratio) - jfm[before][glueorkern][after][1] = jfm[before][glueorkern][after][1] + space -end - -if jlreq ~= nil then - if type(jlreq.open_bracket_pos) == "string" then - local r = jlreq.open_bracket_pos:find("_") - local danraku = jlreq.open_bracket_pos:sub(1,r - 1) - local orikaeshi = jlreq.open_bracket_pos:sub(r + 1) - - -- 折り返し行頭の開き括弧を二分下げる……つもり - if orikaeshi == "nibu" then - -- widthを二分増やし，その代わりJFMグルーを二分減らす - jfm[1].width = jfm[1].width + 0.5 - for k,v in pairs(jfm) do - if type(k) == "number" then - add_space(k,1,"glue",-0.5,1) - end - end - end - - -- 段落行頭の下げ - if danraku == "zenkakunibu" then - add_space(90,1,"glue",0.5,1) - elseif danraku == "nibu" then - add_space(90,1,"glue",-0.5,1) - end - end - - -- ぶら下げ組を有効にする． - if jlreq.burasage == true then - for _,class in ipairs({6,7}) do - table.insert(jfm[class].end_adjust,-0.5) - end - end -end -luatexja.jfont.define_jfm(jfm) +local jfm={ + [0]={ + ["align"]="middle", + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["left"]=0, + ["width"]=1, + }, + { + ["align"]="right", + ["chars"]={ "（", "〔", "［", "｛", "〈", "《", "「", "『", "【", "｟", "〘", "〖", "«", "〝", "‘", "“" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ 0, 0, 0 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ 0, 0, 0 }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ 0, 0, 0 }, + [13]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [15]={ 0, 0, 0 }, + [16]={ 0, 0, 0 }, + [27]={ 0, 0, 0 }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + { + ["align"]="left", + ["chars"]={ "）", "〕", "］", "｝", "〉", "》", "」", "』", "】", "｠", "〙", "〗", "»", "〟", "’", "”" }, + ["depth"]=0.5, + ["end_adjust"]={ 0.5, 0 }, + ["glue"]={ + [0]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + { 0, 0, 0 }, + [4]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [9]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [10]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [11]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [12]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [13]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [16]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [27]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [300]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [301]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [302]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + [4]={ + ["align"]="middle", + ["chars"]={ "！", "？", "‼", "⁇", "⁈", "⁉" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=1, + }, + [5]={ + ["align"]="middle", + ["chars"]={ "・", "：", "；" }, + ["depth"]=0.5, + ["end_adjust"]={ 0.25, 0 }, + ["glue"]={ + [0]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + { + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + { + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [4]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [5]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -1 }, + ["ratio"]=0.5, + }, + [6]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [7]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [8]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [9]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [10]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [11]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [12]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [13]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [14]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [15]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [16]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [27]={ + 0.25, + 0.25, + 0.25, + ["priority"]={ -1, -1 }, + ["ratio"]=0, + }, + [300]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [301]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + [302]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0, + }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + [6]={ + ["align"]="left", + ["chars"]={ "。", "．" }, + ["depth"]=0.5, + ["end_adjust"]={ 0.5, 0 }, + ["glue"]={ + [0]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + { + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + { 0, 0, 0 }, + [4]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [5]={ + 0.75, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=0.33333333, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [9]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [10]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [11]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [12]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [13]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [14]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [15]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [16]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [27]={ + 0.5, + 0.25, + 0, + ["priority"]={ -1, 0 }, + ["ratio"]=0, + }, + [300]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [301]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + [302]={ + 0.5, + 0, + 0, + ["ratio"]=0, + }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + [7]={ + ["align"]="left", + ["chars"]={ "、", "，" }, + ["depth"]=0.5, + ["end_adjust"]={ 0.5, 0 }, + ["glue"]={ + [0]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + { 0, 0, 0 }, + [4]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [5]={ + 0.75, + 0, + 0.75, + ["priority"]={ 0, -1 }, + ["ratio"]=0.33333333, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [9]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [10]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [11]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [12]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [13]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [14]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [15]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [16]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [27]={ + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=0, + }, + [300]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [301]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + [302]={ + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=0, + }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + [8]={ + ["align"]="middle", + ["chars"]={ "—", "…", "‥", "〳", "〴", "〵" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=1, + }, + [9]={ + ["align"]="middle", + ["chars"]={ "ヽ", "ヾ", "ゝ", "ゞ", "々", "〻" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [10]={ + ["align"]="middle", + ["chars"]={ "ー" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [11]={ + ["align"]="middle", + ["chars"]={ "ぁ", "ぃ", "ぅ", "ぇ", "ぉ", "ァ", "ィ", "ゥ", "ェ", "ォ", "っ", "ゃ", "ゅ", "ょ", "ゎ", "ゕ", "ゖ", "ッ", "ャ", "ュ", "ョ", "ヮ", "ヵ", "ヶ", "ㇰ", "ㇱ", "ㇲ", "ㇳ", "ㇴ", "ㇵ", "ㇶ", "ㇷ", "ㇸ", "ㇹ", "ㇺ", "ㇻ", "ㇼ", "ㇽ", "ㇾ", "ㇿ", "ㇷ゚" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [12]={ + ["align"]="middle", + ["chars"]={ "￥", "＄", "￡", "＃", "€", "№" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + { + 0.5, + 0, + 0.5, + ["priority"]={ 0, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [13]={ + ["align"]="middle", + ["chars"]={ "°", "′", "″", "℃", "￠", "％", "‰", "㏋", "ℓ", "㌃", "㌍", "㌔", "㌘", "㌢", "㌣", "㌦", "㌧", "㌫", "㌶", "㌻", "㍉", "㍊", "㍍", "㍑", "㍗", "㎎", "㎏", "㎜", "㎝", "㎞", "㎡", "㏄" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [14]={ + ["align"]="middle", + ["chars"]={ "　" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=1, + }, + [15]={ + ["align"]="middle", + ["chars"]={ "あ", "い", "う", "え", "お", "か", "が", "き", "ぎ", "く", "ぐ", "け", "げ", "こ", "ご", "さ", "ざ", "し", "じ", "す", "ず", "せ", "ぜ", "そ", "ぞ", "た", "だ", "ち", "ぢ", "つ", "づ", "て", "で", "と", "ど", "な", "に", "ぬ", "ね", "の", "は", "ば", "ぱ", "ひ", "び", "ぴ", "ふ", "ぶ", "ぷ", "へ", "べ", "ぺ", "ほ", "ぼ", "ぽ", "ま", "み", "む", "め", "も", "や", "ゆ", "よ", "ら", "り", "る", "れ", "ろ", "わ", "ゐ", "ゑ", "を", "ん", "ゔ", "か゚", "き゚", "く゚", "け゚", "こ゚" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [16]={ + ["align"]="middle", + ["chars"]={ "ア", "イ", "ウ", "エ", "オ", "カ", "ガ", "キ", "ギ", "ク", "グ", "ケ", "ゲ", "コ", "ゴ", "サ", "ザ", "シ", "ジ", "ス", "ズ", "セ", "ゼ", "ソ", "ゾ", "タ", "ダ", "チ", "ヂ", "ツ", "ヅ", "テ", "デ", "ト", "ド", "ナ", "ニ", "ヌ", "ネ", "ノ", "ハ", "バ", "パ", "ヒ", "ビ", "ピ", "フ", "ブ", "プ", "ヘ", "ベ", "ペ", "ホ", "ボ", "ポ", "マ", "ミ", "ム", "メ", "モ", "ヤ", "ユ", "ヨ", "ラ", "リ", "ル", "レ", "ロ", "ワ", "ヰ", "ヱ", "ヲ", "ン", "ヴ", "ヷ", "ヸ", "ヹ", "ヺ", "カ゚", "キ゚", "ク゚", "ケ゚", "コ゚", "セ゚", "ツ゚", "ト゚" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [14]={ 0, 0, 0 }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [27]={ + ["chars"]={ "alchar" }, + ["depth"]=0.5, + ["glue"]={ + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ 0, 0 }, + }, + [14]={ 0, 0, 0 }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [90]={ + ["chars"]={ "parbdd", "boxbdd" }, + ["depth"]=0.5, + ["glue"]={ + { 0, 0, 0 }, + }, + ["height"]=0.5, + }, + [300]={ + ["align"]="middle", + ["chars"]={ "‐" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=0.25, + }, + [301]={ + ["align"]="middle", + ["chars"]={ "゠", "–" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=0.5, + }, + [302]={ + ["align"]="middle", + ["chars"]={ "〜" }, + ["depth"]=0.5, + ["glue"]={ + [0]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + { + 0.5, + 0.25, + 0.5, + ["priority"]={ -1, -2 }, + ["ratio"]=1, + }, + { 0, 0, 0 }, + [4]={ 0, 0, 0 }, + [5]={ + 0.25, + 0, + 0.25, + ["priority"]={ 0, -1 }, + ["ratio"]=1, + }, + [6]={ 0, 0, 0 }, + [7]={ 0, 0, 0 }, + [8]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [9]={ 0, 0, 0 }, + [10]={ 0, 0, 0 }, + [11]={ 0, 0, 0 }, + [12]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [13]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [14]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [15]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [16]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [27]={ + 0, + 0.25, + 0, + ["priority"]={ -1, 0 }, + }, + [300]={ 0, 0, 0 }, + [301]={ 0, 0, 0 }, + [302]={ 0, 0, 0 }, + }, + ["height"]=0.5, + ["width"]=1, + }, + ["dir"]="tate", + ["kanjiskip"]={ 0, 0.25, 0 }, + ["version"]=3, + ["xkanjiskip"]={ 0.25, 0.25, 0.125 }, + ["zh"]=1, + ["zw"]=1, +} +local function add_space(before,after,glueorkern,space,ratio) + if jfm[before][glueorkern] == nil then jfm[before][glueorkern] = {} end + if jfm[before][glueorkern][after] == nil then jfm[before][glueorkern][after] = {0} end + local origratio = jfm[before][glueorkern][after].ratio + if origratio == nil then origratio = 0.5 end + jfm[before][glueorkern][after].ratio = (jfm[before][glueorkern][after][1] * origratio + space * ratio) / (jfm[before][glueorkern][after][1] + ratio) + jfm[before][glueorkern][after][1] = jfm[before][glueorkern][after][1] + space +end + +if jlreq ~= nil then + if type(jlreq.open_bracket_pos) == "string" then + local r = jlreq.open_bracket_pos:find("_") + local danraku = jlreq.open_bracket_pos:sub(1,r - 1) + local orikaeshi = jlreq.open_bracket_pos:sub(r + 1) + + -- 折り返し行頭の開き括弧を二分下げる……つもり + if orikaeshi == "nibu" then + -- widthを二分増やし，その代わりJFMグルーを二分減らす + jfm[1].width = jfm[1].width + 0.5 + for k,v in pairs(jfm) do + if type(k) == "number" then + add_space(k,1,"glue",-0.5,1) + end + end + end + + -- 段落行頭の下げ + if danraku == "zenkakunibu" then + add_space(90,1,"glue",0.5,1) + elseif danraku == "nibu" then + add_space(90,1,"glue",-0.5,1) + end + end + + -- ぶら下げ組を有効にする． + if jlreq.burasage == true then + for _,class in ipairs({6,7}) do + table.insert(jfm[class].end_adjust,-0.5) + end + end +end +luatexja.jfont.define_jfm(jfm) diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 1970-01-01 00:00:00.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty 2018-08-03 21:17:14.000000000 +0000 @@ -0,0 +1,396 @@ +% +% luatexja-fontspec-26h.sty +% + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{luatexja-fontspec-26h}[2018/08/02 fontspec support of LuaTeX-ja] +\RequirePackage{l3keys2e,luatexja} +\ExplSyntaxOn + +%%%%%%%% Change Japanese font family by \rmfamily or not +\cs_new:Npn \ltj_fontspec_match_cmd { + \renewcommand\jttdefault{\gtdefault} + \@ltj@match@familytrue + \DeclareDocumentCommand \setmonojfont { O{} m } { + \ltj_fontspec_set_family:Nnn \jttdefault {##1}{##2} + \normalfont + } +} +\bool_if:NT \ltj_fontspec_match_bool \ltj_fontspec_match_cmd + +%%%%%%%% Messages +\msg_new:nnn {luatexja-fontspec} {addjfontfeatures-ignored} +{ + \string\addjfontfeature (s)~ ignored;\\ + it~ cannot~ be~ used~ with~ a~ font~ that~ wasn't~ selected~ by~ luatexja-fontspec. +} + +\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-norange} +{ + ignored~ sublist~ `#1'~ in~ AltFont~ (no~ range~ is~ specified). +} + +\msg_new:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} +{ + ignored~ sublist~ `#1'~ in~ AltFont~ (only~ range~ is~ specified). +} + +\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx} + +%%%%%%%% Internal control sequences +%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec. +\cs_new:Nn \ltj_fontspec_define_option:nn { + \__fontspec_keys_define_code:nnn {fontspec} {#1} {#2} +} +\cs_new:Nn \ltj_fontspec_define_preparse_external:nn { + \__fontspec_keys_define_code:nnn {fontspec-preparse-external} {#1} {#2} +} +\cs_new:Nn \ltj_fontspec_define_altfont_option:nn { + \__fontspec_keys_define_code:nnn {fontspec-ltjaltfont} {#1} {#2} +} + +%% Alternate Fonts +%% Spec: AltFont = { +%% ... +%% { Range = , }, +%% { Range = , Font = , }, +%% { Range = , Font = }, +%% ... +%% } +\tl_new:N \l_ltj_fontspec_altname_tl +\tl_new:N \l_ltj_fontspec_altrange_tl +\clist_new:N \l_ltj_fontspec_altfont_clist +\clist_new:N \l_ltj_fontspec_altfont_leftover_clist +\int_new:N \g_ltj_fontspec_altnumber_int + +\ltj_fontspec_define_altfont_option:nn {Range} { + \tl_set:Nn \l_ltj_fontspec_altrange_tl {#1} +} +\ltj_fontspec_define_altfont_option:nn {Font} { + \fontspec_complete_fontname:Nn \l_ltj_fontspec_altname_tl {#1} +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {AltFont} { + \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { #1 } +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {YokoFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { #1 } +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { #1 } +} +\__fontspec_keys_define_code:nnn {fontspec-ltjaltfont-reparse} {TateFont} { + \tl_if_empty:nF {#1} { + \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {#1} + } +} +%% +\clist_new:N \l_ltj_fontspec_fontfeat_yoko_clist +\clist_new:N \l_ltj_fontspec_fontfeat_tate_clist +\tl_new:N \l_ltj_fontspec_fontname_tate_tl + +\cs_new:Npn \ltj_fontspec_DeclareFontFamily #1 #2 #3 { + \DeclareKanjiFamily {JY3} {#2} {#3} + \DeclareKanjiFamily {JT3} {#2} {#3} +} + +%% save and restore global variable +\tl_new:N \g__ltj_fontspec_kanji_nfss_family_tl +\tl_new:N \g__ltj_fontspec_orig_nfss_family_tl +\seq_new:N \g__ltj_fontspec_kanji_bf_series_seq +\seq_new:N \g__ltj_fontspec_orig_bf_series_seq +\clist_new:N \g__ltj_fontspec_kanji_default_fontopts_clist +\clist_new:N \g__ltj_fontspec_orig_default_fontopts_clist + +\cs_new:Nn \__ltj_set_global_variable_for_kanji: { + \tl_gset_eq:NN \g__ltj_fontspec_orig_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_kanji_nfss_family_tl + \seq_gset_eq:NN \g__ltj_fontspec_orig_bf_series_seq \g__fontspec_bf_series_seq + \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_kanji_bf_series_seq + %\seq_gclear:N \g__fontspec_bf_series_seq + \clist_set_eq:NN \g__ltj_fontspec_orig_default_fontopts_clist \g__fontspec_default_fontopts_clist + \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_kanji_default_fontopts_clist +} + +\cs_new:Nn \__ltj_restore_global_variable: { + \tl_gset_eq:NN \g__ltj_fontspec_kanji_nfss_family_tl \g__fontspec_nfss_family_tl + \tl_gset_eq:NN \g__fontspec_nfss_family_tl \g__ltj_fontspec_orig_nfss_family_tl + \seq_gset_eq:NN \g__ltj_fontspec_kanji_bf_series_seq \g__fontspec_bf_series_seq + \seq_gset_eq:NN \g__fontspec_bf_series_seq \g__ltj_fontspec_orig_bf_series_seq + \clist_set_eq:NN \g__ltj_fontspec_kanji_default_fontopts_clist \g__fontspec_default_fontopts_clist + \clist_set_eq:NN \g__fontspec_default_fontopts_clist \g__ltj_fontspec_orig_default_fontopts_clist +} + +\cs_set_eq:NN \__ltj_orig_fontspec_select_font_family:nn \__fontspec_select_font_family:nn +\cs_new_protected:Nn \ltj_fontspec_select_font_family:nn { + \group_begin: + \ltj_fontspec_define_option:nn {NoEmbed} {} + \ltj_fontspec_define_option:nn {AltFont} { + \clist_put_right:Nn \l_ltj_fontspec_altfont_clist { ##1 } + } + \ltj_fontspec_define_option:nn {CID} { + \__fontspec_update_featstr:n {cid=##1} + } + \ltj_fontspec_define_option:nn {Kanjiskip} { + \str_if_eq_x:nnTF {false} { \str_lower_case:n { ##1 } }{ + \__fontspec_update_featstr:n {-ltjksp} + } { + \__fontspec_update_featstr:n {+ltjksp} + } + } + \ltj_fontspec_define_option:nn {JFM} { + \__fontspec_update_featstr:n {jfm=##1} + } + % vary by shape + \ltj_fontspec_define_option:nn {YokoFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_yoko_clist { ##1 } + } + \ltj_fontspec_define_option:nn {TateFeatures} { + \clist_put_right:Nn \l_ltj_fontspec_fontfeat_tate_clist { ##1 } + } + \ltj_fontspec_define_option:nn {TateFont} + { + \tl_if_empty:nF {##1} { + \fontspec_complete_fontname:Nn \l_ltj_fontspec_fontname_tate_tl {##1} + } + } + \ltj_fontspec_define_option:nn {JFM-var} { + \__fontspec_update_featstr:n {jfmvar=##1} + } + \ltj_fontspec_define_preparse_external:nn {NoEmbed} { + \cs_set:Npn \__fontspec_fontname_wrap:n ##1 {psft:##1} + } + + %% Omit the warning message + %% "OpenType feature 'Kerning=Off' (-kern) not available ..." + \keys_define:nn {fontspec-opentype} { + Kerning/Off.code:n=\__fontspec_update_featstr:n {-kern} + } + \clist_set:Nx \g__fontspec_default_fontopts_clist { + YokoFeatures = { JFM=ujis }, TateFeatures = { JFM=ujisv }, + Scale=\Cjascale, Kerning=Off, Script=CJK, + \g__ltj_fontspec_kanji_default_fontopts_clist + } + \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop + \cs_set_eq:NN \__fontspec_make_font_shapes:Nnnnn \ltj_fontspec_make_font_shapes:Nnnnn + \cs_set_eq:NN \DeclareFontFamily \ltj_fontspec_DeclareFontFamily + \tl_set:Nn \g_fontspec_encoding_tl {JY3} + \__ltj_orig_fontspec_select_font_family:nn{#1}{#2} + + \cs_gset:Npx \__ltj_fontspec_aftergroup { + \exp_not:N \tl_set:Nn \exp_not:N \l_fontspec_family_tl { \l_fontspec_family_tl } + } + \aftergroup \__ltj_fontspec_aftergroup + \group_end: +} + +%% declare_shape + +\cs_new:Nn \ltj_fontspec_declare_shape_yoko:nnnn { + \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JY3 } { \l_ltj_fontspec_fontfeat_yoko_clist } +} +\cs_new:Nn \ltj_fontspec_declare_shape_tate:nnnn { + \ltj_fontspec_declare_shape_aux:nnnnnn {#1} {#2} {#3} {#4} { JT3 } { \l_ltj_fontspec_fontfeat_tate_clist } +} +\cs_new:Nn \ltj_fontspec_declare_shape:nnnn { + \ltj_fontspec_declare_shape_yoko:nnnn {#1} {#2} {#3} {#4} + \ltj_fontspec_declare_shape_tate:nnnn {#1} {#2} {#3} {#4} +} +\cs_generate_variant:Nn \ltj_fontspec_declare_shape:nnnn {nnxx} +\cs_generate_variant:Nn \ltj_fontspec_declare_shape_yoko:nnnn {nnxx} +\cs_generate_variant:Nn \ltj_fontspec_declare_shape_tate:nnnn {nnxx} + +\cs_new:Nn \ltj_fontspec_declare_shape_aux:nnnnnn + { + \tl_clear:N \l__fontspec_nfss_tl + \tl_clear:N \l__fontspec_nfss_sc_tl + \tl_set_eq:NN \l__fontspec_saved_fontname_tl \l_fontspec_fontname_tl + + \tl_set:Nn \g_fontspec_encoding_tl {#5} + \tl_set:Nn \g__fontspec_nfss_enc_tl {#5} + \exp_args:Nx \clist_map_inline:nn {#4} + { + \tl_clear:N \l__fontspec_size_tl + \tl_set_eq:NN \l__fontspec_sizedfont_tl \l__fontspec_saved_fontname_tl % in case not spec'ed + + \keys_set_known:nxN {fontspec-sizing} { \exp_after:wN \use:n ##1 } + \l__fontspec_sizing_leftover_clist + \tl_if_empty:NT \l__fontspec_size_tl { \__fontspec_error:n {no-size-info} } + + \str_if_eq:nnTF { #5 } { JY3 } { + % "normal" + \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} + } { + \tl_if_empty:NTF \l_ltj_fontspec_fontname_tate_tl + { \__fontspec_load_fontname:n {\l__fontspec_sizedfont_tl} } + { \__fontspec_load_fontname:n {\l_ltj_fontspec_fontname_tate_tl} } + } + \__fontspec_setup_nfss:Nnnn \l__fontspec_nfss_tl {#3} {#6} {} + } + \bool_set_true:N \l__fontspec_nosc_bool + \__fontspec_declare_shapes_normal:nn {#1} {#2} + \__fontspec_declare_shape_slanted:nn {#1} {#2} + } + +\cs_new:Nn \ltj_fontspec_set_family:Nnn { + \__ltj_set_global_variable_for_kanji: + \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn + \__ltj_orig_fontspec_set_family:Nnn #1 {#2} {#3} + \cs_set_eq:NN \__fontspec_select_font_family:nn \__ltj_orig_fontspec_select_font_family:nn + \__ltj_restore_global_variable: +} +\cs_set_eq:NN \__ltj_orig_fontspec_set_family:Nnn \fontspec_set_family:Nnn +\cs_set_eq:NN \__ltj_orig_fontspec_make_font_shapes:Nnnnn \__fontspec_make_font_shapes:Nnnnn +\cs_set_eq:NN \__ltj_fontspec_orig_DeclareFontShape \DeclareFontShape + +\cs_new:Nn \ltj_fontspec_make_font_shapes:Nnnnn { + \group_begin: + %% 基底フォント + \cs_set_eq:NN \__fontspec_font_set:Nnn \use_none:nnn + \cs_set_eq:NN \__fontspec_font_if_null:NT \use_none:nn + \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape:nnxx + \__ltj_orig_fontspec_make_font_shapes:Nnnnn {#1} {#2} {#3} {#4} {#5} + %% + \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3} + {#4, \l_ltj_fontspec_fontfeat_yoko_clist}{#5} {JY3 } + \ltj_fontspec_make_font_shapes_alt:Nnnnnn {#1}{#2}{#3} + {#4, \l_ltj_fontspec_fontfeat_tate_clist}{#5} {JT3} + \group_end: + } + +%%% Altfont 内部処理部 +\cs_new:Nn \ltj_fontspec_make_font_shapes_alt:Nnnnnn { + \group_begin: + \str_if_eq:nnTF { #6 } { JY3 } { + \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_yoko:nnxx + }{ + \cs_set_eq:NN \__fontspec_declare_shape:nnxx \ltj_fontspec_declare_shape_tate:nnxx + } + \keys_set_known:nn {fontspec-ltjaltfont-reparse} { #4 } + \clist_if_empty:NF \l_ltj_fontspec_altfont_clist { + \int_gzero:N \g_ltj_fontspec_altnumber_int + \clist_map_inline:Nn \l_ltj_fontspec_altfont_clist { + \tl_clear:N \l_ltj_fontspec_altrange_tl + \tl_set:Nn \l_ltj_fontspec_altname_tl { #1 } + \tl_set:Nn \l_tmpa_tl { #1 } + + \keys_set_known:nxN {fontspec-ltjaltfont} { \exp_after:wN \use:n ##1 } + \l_ltj_fontspec_altfont_leftover_clist + \keys_set_known:nn {fontspec-ltjaltfont-reparse} { \exp_after:wN \use:n ##1 } + + \tl_if_empty:NT \l_ltj_fontspec_altrange_tl { + \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-norange} { ##1 } + } { + \bool_if:nTF { + \tl_if_eq_p:NN \l_ltj_fontspec_altname_tl \l_tmpa_tl + && + \tl_if_empty_p:N \l_ltj_fontspec_altfont_leftover_clist + } { + \msg_warning:nnn {luatexja-fontspec} {altfont-ignored-by-rangeonly} { ##1 } + } { + \__ltj_orig_fontspec_make_font_shapes:Nnnnn + { \l_ltj_fontspec_altname_tl } {#2} + {#3 _ alt \int_use:N \g_ltj_fontspec_altnumber_int } + {#4, \l_ltj_fontspec_altfont_leftover_clist } + {#5} + \DeclareAlternateKanjiFont + { #6 }{ \g__fontspec_nfss_family_tl }{#2}{#3}% + { #6 }{ \g__fontspec_nfss_family_tl }{#2} + { #3 _alt \int_use:N \g_ltj_fontspec_altnumber_int } + { \l_ltj_fontspec_altrange_tl } + \int_gincr:N \g_ltj_fontspec_altnumber_int + } + } + } + } + \group_end: +} + + +%%%%%%%% User commands +\DeclareDocumentCommand \jfontspec { O{} m O{} } { + \ltj_fontspec_set_family:Nnn \k@family {#1,#3}{#2} + \selectfont + \ignorespaces +} + +\DeclareDocumentCommand \setmainjfont { O{} m O{} } { + \ltj_fontspec_set_family:Nnn \mcdefault {#1,#3}{#2} + \DeclareSymbolFont{mincho}{JY3}{\mcdefault}{\mddefault}{n} + \SetSymbolFont{mincho}{bold}{JY3}{\mcdefault}{\bfdefault}{n} + \normalfont +} + +\DeclareDocumentCommand \setsansjfont { O{} m O{} } { + \ltj_fontspec_set_family:Nnn \gtdefault {#1,#3}{#2} + \DeclareMathAlphabet{\mathgt}{JY3}{\gtdefault}{\mddefault}{n} + \normalfont +} + +\DeclareDocumentCommand \newjfontfamily { m O{} m O{} } { + \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn + \newfontfamily #1 [#2,#4] {#3} + \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn +} +\DeclareDocumentCommand \renewjfontfamily { m O{} m O{} } { + \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn + \renewfontfamily #1 [#2,#4] {#3} + \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn +} +\DeclareDocumentCommand \setjfontfamily { m O{} m O{} } { + \cs_set_eq:NN \fontspec_set_family:Nnn \ltj_fontspec_set_family:Nnn + \setfontfamily #1 [#2,#4] {#3} + \cs_set_eq:NN \fontspec_set_family:Nnn \__ltj_orig_fontspec_set_family:Nnn +} + +\DeclareDocumentCommand \newjfontface { m O{} m O{} } { + \newjfontfamily #1 [ BoldFont={},ItalicFont={},SmallCapsFont={},#2,#4 ] {#3} +} + +\prop_new:N \g__ltj_fontspec_fontopts_prop +\DeclareDocumentCommand \defaultjfontfeatures { t+ o m } + { + \IfNoValueTF {#2} + { \__ltj_fontspec_set_default_features:nn {#1} {#3} } + { \__ltj_fontspec_set_font_default_features:nnn {#1} {#2} {#3} } + \ignorespaces + } +\cs_new:Nn \__ltj_fontspec_set_default_features:nn + { + \__ltj_set_global_variable_for_kanji: + \__fontspec_set_default_features:nn {#1} {#2} + \__ltj_restore_global_variable: + } +\cs_new:Nn \__ltj_fontspec_set_font_default_features:nnn + { + \prop_set_eq:NN \l__ltj_fontspec_tmp_prop \g__fontspec_fontopts_prop + \prop_set_eq:NN \g__fontspec_fontopts_prop \g__ltj_fontspec_fontopts_prop + \__fontspec_set_font_default_features:nnn {#1} {#2} {#3} + \prop_set_eq:NN \g__ltj_fontspec_fontopts_prop \g__fontspec_fontopts_prop + \prop_set_eq:NN \g__fontspec_fontopts_prop \l__ltj_fontspec_tmp_prop + } + +\DeclareDocumentCommand \addjfontfeatures {m} { + \ltj_fontspec_if_fontspec_font:TF + { + \__ltj_set_global_variable_for_kanji: + \group_begin: + \tl_set_eq:NN \f@family \k@family + \cs_set_eq:NN \__fontspec_select_font_family:nn \ltj_fontspec_select_font_family:nn + \addfontfeatures {#1} + \group_end: + \kanjifamily\g__fontspec_nfss_family_tl\selectfont + \__ltj_restore_global_variable: + }{ + \msg_warning:nn {luatexja-fontspec} {addjfontfeatures-ignored} + } + \ignorespaces +} + +\cs_set_eq:NN \addjfontfeature \addjfontfeatures + +\prg_new_conditional:Nnn \ltj_fontspec_if_fontspec_font: {TF,T,F} +{ + \cs_if_exist:cTF {g__fontspec_fontinfo_ \k@family _prop} \prg_return_true: \prg_return_false: +} + +\endinput diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty 2018-01-21 22:34:29.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty 2018-08-03 21:17:14.000000000 +0000 @@ -3,7 +3,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{luatexja-fontspec}[2017/12/31 fontspec support of LuaTeX-ja] +\ProvidesPackage{luatexja-fontspec}[2018/07/31 fontspec support of LuaTeX-ja] \RequirePackage{l3keys2e,luatexja} \ExplSyntaxOn @@ -30,10 +30,9 @@ \ProcessKeysOptions{ luatexja-fontspec } \RequirePackage{fontspec}[2017/01/01]% v2.5c -\RequirePackage{luatexja-fontspec-25c} -%\@ifpackagelater{fontspec}{2017/01/01}% -% {\RequirePackage{luatexja-fontspec-25c}}% v2.5c -% {\RequirePackage{luatexja-fontspec-24}}% --v2.5a +\@ifpackagelater{fontspec}{2018/07/29}% + {\RequirePackage{luatexja-fontspec-26h}}% v2.6h + {\RequirePackage{luatexja-fontspec-25c}}% v2.5c \ExplSyntaxOff %%%%%%%% Now we completely ignore kanjifont definition file. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty 2018-08-03 21:17:14.000000000 +0000 @@ -1,5 +1,5 @@ % luatexja-preset.sty -\ProvidesPackage{luatexja-preset}[2018/06/15 Japanese font presets] +\ProvidesPackage{luatexja-preset}[2018/08/01 Japanese font presets] \RequirePackage{expl3,l3keys2e} \RequirePackage{luatexja} @@ -562,6 +562,10 @@ \seq_if_in:NnTF \g_ltjpreset_presets_seq { #2 } { \bool_if:cTF { c_ #1 _bool } { \msg_warning:nnn { luatexja-preset }{ exist-preset-overwrite } { #2 } + \keys_define:nn { luatexja-preset } { + #2 .meta:n = { #3, __custom = true, __noembed = false, __office = false, }, + #2 .value_forbidden:n = true, #2 .groups:n = { preset }, + } } { \msg_error:nnn { luatexja-preset }{ exist-preset-nooverwrite } { #2 } } @@ -579,6 +583,7 @@ \cs_set:Npn \ltjapplypreset #1 { \keys_set_groups:nnn { luatexja-preset } { preset } { #1 } + % \prop_map_inline:Nn \g_ltjpreset_font_prop {\typeout{ [##1] = "##2" } } \ltjpreset_extract_fonts: \ltjpreset_check_deluxe_existence: \ltjpreset_do_fontset: diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjarticle.cls 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -779,7 +779,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk10.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk11.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbk12.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbook.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjbook.cls 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -882,7 +882,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltj-direction.lua texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltj-direction.lua --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltj-direction.lua 2018-07-28 22:07:14.000000000 +0000 @@ -640,7 +640,7 @@ local bh = getlist(b) local box_dir, dn = get_box_dir(b, ltjs.list_dir) -- 既に b の中身にあるwhatsit - if not dn then + if (box_dir\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -1286,8 +1288,7 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} \newcommand{\listoffigures}{% \section*{\listfigurename}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsbook.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsbook.cls 2018-08-03 21:17:14.000000000 +0000 @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsbook} - [2018/06/09 ltjsclasses ] + [2018/07/30 ltjsclasses ] \def\jsc@clsname{ltjsbook} \RequirePackage{luatexja} \newif\if@restonecol @@ -209,11 +209,11 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassError{\jsc@clsname}{this class does not support `uplatex' option}} \DeclareOption{autodetect-engine}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -249,7 +249,7 @@ \ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \ifjsc@mag@xreal -\ifdim\jsc@mpt=\p@\else +\ifdim\jsc@mpt=\p@\jsc@mag@xrealfalse\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax @@ -1362,6 +1362,8 @@ \@dottedtocline{5}{\@tempdima}{6.5\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} +\def\jsTocLine{\leaders\hbox{% + $\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -1371,8 +1373,7 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize10.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize11.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsize12.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls 2018-08-03 21:17:14.000000000 +0000 @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjskiyou} - [2018/06/09 ltjsclasses ] + [2018/07/30 ltjsclasses ] \def\jsc@clsname{ltjskiyou} \RequirePackage{luatexja} \newif\if@restonecol @@ -203,11 +203,11 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassError{\jsc@clsname}{this class does not support `uplatex' option}} \DeclareOption{autodetect-engine}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -241,7 +241,7 @@ \ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \ifjsc@mag@xreal -\ifdim\jsc@mpt=\p@\else +\ifdim\jsc@mpt=\p@\jsc@mag@xrealfalse\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax @@ -1239,6 +1239,8 @@ \@dottedtocline{5}{\@tempdima}{6\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} +\def\jsTocLine{\leaders\hbox{% + $\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -1248,8 +1250,7 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} \newcommand{\listoffigures}{% \section*{\listfigurename}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjspf.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjspf.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjspf.cls 2018-08-03 21:17:14.000000000 +0000 @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjspf} - [2018/06/09 ltjsclasses ] + [2018/07/30 ltjsclasses ] \def\jsc@clsname{ltjspf} \RequirePackage{luatexja} \newif\if@restonecol @@ -203,11 +203,11 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassError{\jsc@clsname}{this class does not support `uplatex' option}} \DeclareOption{autodetect-engine}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -240,7 +240,7 @@ \ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \ifjsc@mag@xreal -\ifdim\jsc@mpt=\p@\else +\ifdim\jsc@mpt=\p@\jsc@mag@xrealfalse\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax @@ -1136,6 +1136,8 @@ \@dottedtocline{5}{\@tempdima}{6\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} +\def\jsTocLine{\leaders\hbox{% + $\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -1145,8 +1147,7 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} \newcommand{\listoffigures}{% \section*{\listfigurename}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsreport.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjsreport.cls 2018-08-03 21:17:14.000000000 +0000 @@ -38,7 +38,7 @@ %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjsreport} - [2018/06/09 ltjsclasses ] + [2018/07/30 ltjsclasses ] \def\jsc@clsname{ltjsreport} \RequirePackage{luatexja} \newif\if@restonecol @@ -208,11 +208,11 @@ \newif\ifptexjis \ptexjisfalse \DeclareOption{winjis}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `winjis' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `winjis' option}} \DeclareOption{uplatex}{% - \ClassErrorNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `uplatex' option}} + \ClassError{\jsc@clsname}{this class does not support `uplatex' option}} \DeclareOption{autodetect-engine}{% - \ClassWarningNoLine{\jsc@clsname}{The \jsc@clsname\space class does not support `autodetect-engine' option}} + \ClassWarningNoLine{\jsc@clsname}{this class does not support `autodetect-engine' option}} \DeclareOption{mingoth}{\mingothtrue} \DeclareOption{ptexjis}{\ptexjistrue} \DeclareOption{jis}{\jisfonttrue} @@ -245,7 +245,7 @@ \ifdim\jsc@mpt=1.2\p@ \renewcommand{\@ptsize}{2}\else \renewcommand{\@ptsize}{-20}\fi\fi \ifjsc@mag@xreal -\ifdim\jsc@mpt=\p@\else +\ifdim\jsc@mpt=\p@\jsc@mag@xrealfalse\else \expandafter\let\csname OT1/cmr/m/n/10\endcsname\relax \expandafter\let\csname TU/lmr/m/n/10\endcsname\relax \expandafter\let\csname OMX/cmex/m/n/10\endcsname\relax @@ -1355,6 +1355,8 @@ \@dottedtocline{5}{\@tempdima}{6.5\zw}} \newdimen\@lnumwidth \def\numberline#1{\hb@xt@\@lnumwidth{#1\hfil}\hspace{0pt}} +\def\jsTocLine{\leaders\hbox{% + $\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep mu$}\hfill} \def\@dottedtocline#1#2#3#4#5{\ifnum #1>\c@tocdepth \else \vskip \z@ \@plus.2\jsc@mpt {\leftskip #2\relax \rightskip \@tocrmarg \parfillskip -\rightskip @@ -1364,8 +1366,7 @@ \@lnumwidth #3\relax \advance\leftskip \@lnumwidth \null\nobreak\hskip -\leftskip {#4}\nobreak - \leaders\hbox{$\m@th \mkern \@dotsep mu\hbox{.}\mkern \@dotsep - mu$}\hfill \nobreak\hb@xt@\@pnumwidth{% + \jsTocLine \nobreak\hb@xt@\@pnumwidth{% \hfil\normalfont \normalcolor #5}\par}\fi} \newcommand{\listoffigures}{% \if@twocolumn\@restonecoltrue\onecolumn diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtarticle.cls 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -794,7 +794,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1\zw \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbook.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtbook.cls 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -897,7 +897,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1\zw \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtreport.cls texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtreport.cls 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} @@ -893,7 +893,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1\zw \noindent\hb@xt@ 2\zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize10.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize11.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2018-03-25 21:24:56.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/ltjtsize12.clo 2018-07-28 22:07:14.000000000 +0000 @@ -23,7 +23,7 @@ %% File: ltjclasses.dtx \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2018/02/04 v1.7h-ltj-15 + [2018/07/24 v1.8-ltj-15 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/luatexja.sty texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/luatexja.sty --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-06-16 21:28:44.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/luatexja.sty 2018-08-03 21:17:14.000000000 +0000 @@ -34,10 +34,10 @@ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname \csname iftrue\endcsname \NeedsTeXFormat{LaTeX2e} - \ProvidesPackage{luatexja}[2018/06/16 Japanese Typesetting with Lua(La)TeX] + \ProvidesPackage{luatexja}[2018/07/28 Japanese Typesetting with Lua(La)TeX] \fi % %%%% VERSION -\def\LuaTeXjaversion{20180616.0} +\def\LuaTeXjaversion{20180803.0} \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty --- texlive-lang-2018.20180725/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty 2017-09-04 21:45:53.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec-immediate.sty 2018-08-03 21:17:14.000000000 +0000 @@ -8,22 +8,85 @@ \RequirePackage{fontspec,luatexja} \ExplSyntaxOn -\@ifpackagelater{fontspec}{2017/01/01}{ +% <= v2.6g uses \l__fontspec_nfss_enc_tl instead of \g__fontspec_nfss_enc_tl +\ifdefined \g__fontspec_nfss_enc_tl \else + \def \g__fontspec_nfss_enc_tl { \l__fontspec_nfss_enc_tl } +\fi + %%%%%%%% fontspec v2.5c overwrites \rmfamily etc. in \setmainfont +\@ifpackagelater{fontspec}{2018/07/29}{ %% 2.6h or later +\cs_set:Nn \__fontspec_main_setmainfont:nn + { + \fontspec_set_family:Nnn \l__fontspec_rmfamily_family_tl {#1} {#2} + \tl_set_eq:NN \rmdefault \l__fontspec_rmfamily_family_tl + \use:x + { + \exp_not:n { \DeclareRobustCommand \rmfamily } + { + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__fontspec_rmfamily_family_tl } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\rmdefault} + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } + \__fontspec_setmainfont_hook:nn {#1} {#2} + \normalfont + } +\cs_set:Nn \__fontspec_main_setsansfont:nn + { + \fontspec_set_family:Nnn \l__fontspec_sffamily_family_tl {#1} {#2} + \tl_set_eq:NN \sfdefault \l__fontspec_sffamily_family_tl + \use:x + { + \exp_not:n { \DeclareRobustCommand \sffamily } + { + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__fontspec_sffamily_family_tl } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\sfdefault} + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } + \__fontspec_setsansfont_hook:nn {#1} {#2} + \normalfont + } +\cs_set:Nn \__fontspec_main_setmonofont:nn + { + \fontspec_set_family:Nnn \l__fontspec_ttfamily_family_tl {#1} {#2} + \tl_set_eq:NN \ttdefault \l__fontspec_ttfamily_family_tl + \use:x + { + \exp_not:n { \DeclareRobustCommand \ttfamily } + { + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__fontspec_ttfamily_family_tl } + \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%% + \exp_not:N \selectfont + } + } + \str_if_eq_x:nnT {\familydefault} {\ttdefault} + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } + \__fontspec_setmonofont_hook:nn {#1} {#2} + \normalfont + } +}{ %% <= 2.6g \DeclareDocumentCommand \setmainfont { O{} m O{} } { \fontspec_set_family:Nnn \g__fontspec_rmfamily_family {#1,#3} {#2} \tl_set_eq:NN \rmdefault \g__fontspec_rmfamily_family \use:x { \exp_not:n { \DeclareRobustCommand \rmfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \fontfamily { \g__fontspec_rmfamily_family } \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\mcdefault\exp_not:N\fi%%% \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\rmdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \normalfont \ignorespaces } @@ -33,14 +96,14 @@ \tl_set_eq:NN \sfdefault \g__fontspec_sffamily_family \use:x { \exp_not:n { \DeclareRobustCommand \sffamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \fontfamily { \g__fontspec_sffamily_family } \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\gtdefault\exp_not:N\fi%%% \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\sfdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \normalfont \ignorespaces } @@ -50,14 +113,14 @@ \tl_set_eq:NN \ttdefault \g__fontspec_ttfamily_family \use:x { \exp_not:n { \DeclareRobustCommand \ttfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \fontfamily { \g__fontspec_ttfamily_family } \exp_not:N\if@ltj@match@family\exp_not:N\kanjifamily\exp_not:N\jttdefault\exp_not:N\fi%%% \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\ttdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \normalfont \ignorespaces } diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/exppl2e.sty texlive-lang-2018.20180824/texmf-dist/tex/platex/base/exppl2e.sty --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/exppl2e.sty 2018-05-20 21:31:08.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/exppl2e.sty 2018-07-28 22:03:37.000000000 +0000 @@ -34,7 +34,7 @@ % case 1: This file must be a normal package \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{exppl2e} - [2018/05/20 v1.0v Experimental pLaTeX2e features] + [2018/07/28 v1.0w Experimental pLaTeX2e features] \PackageWarningNoLine{exppl2e}{% This is the unstable, experimental part of pLaTeX2e.\MessageBreak This package may contain:\MessageBreak @@ -124,149 +124,6 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B} -% -% \begin{macro}{\pltx@isletter} -% \changes{v???}{????/??/??}{PDF$B$N$7$*$j$K%"%/%;%s%HJ8;z$,4^$^$l$k>l9g$KBP1~(B} -% \begin{macrocode} -%\plIncludeInRelease{????/??/??}{\pltx@isletter} -% {Support PD1 encoding}% -%<*plcore|platexrelease> -\def\pltx@mark{\pltx@mark@} -\let\pltx@scanstop\relax -\long\def\pltx@cond#1\fi{% - #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -\def\pltx@pdfencA{PD1} -\def\pltx@composite@chkenc{% - \ifx\pltx@pdfencA\f@encoding - \expandafter\@firstoftwo - \else - \expandafter\@secondoftwo - \fi} -\long\def\pltx@isletter#1{% - \expandafter\pltx@isletter@i#1\pltx@scanstop} -\long\def\pltx@isletter@i#1\pltx@scanstop{% - \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% - {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} -\long\def\pltx@isletter@ii#1\pltx@scanstop#{% - \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% - {\pltx@isletter@iii}{\pltx@isletter@iv}} -\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} -\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% - \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% - \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\pltx@composite@chkenc}% - }{\pltx@composite@chkenc}} -% -%\plEndIncludeInRelease -%\plIncludeInRelease{2016/06/10}{\pltx@isletter} -% {Added \pltx@isletter}% -%\def\pltx@mark{\pltx@mark@} -%\let\pltx@scanstop\relax -%\long\def\pltx@cond#1\fi{% -% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} -%\long\def\pltx@isletter#1{% -% \expandafter\pltx@isletter@i#1\pltx@scanstop} -%\long\def\pltx@isletter@i#1\pltx@scanstop{% -% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% -% {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} -%\long\def\pltx@isletter@ii#1\pltx@scanstop#{% -% \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% -% {\pltx@isletter@iii}{\pltx@isletter@iv}} -%\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} -%\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% -% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% -% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi -% {\@firstoftwo}{\@secondoftwo}% -% }{\@secondoftwo}} -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -% \begin{macro}{\@text@composite@x} -% \changes{v???}{????/??/??}{v1.6e$B$G$$$C$?$s%Q%C%A$r=|5n$7$?%3!<%I$r:FF3F~(B} -% \begin{macrocode} -%\plIncludeInRelease{????/??/??}{\@text@composite@x} -% {Fix for non-zero baselineshift}% -%<*plcore|platexrelease> -\def\@text@composite@x#1#2{% - \ifx#1\relax - #2% - \else\pltx@isletter{#1}{#1}{% - \begingroup - \setbox\z@\hbox\bgroup% - \ybaselineshift\z@\tbaselineshift\z@ - #1% - \g@tlastchart@\@tempcntb - \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% - \aftergroup\pltx@composite@temp - \egroup -% \end{macrocode} -% \begin{macrocode} - \ifnum\@tempcntb<\z@ - \@tempdima=\iftdir - \ifmdir - \ifmmode\tbaselineshift\else\ybaselineshift\fi - \else - \tbaselineshift - \fi - \else - \ybaselineshift - \fi - \@tempcntb=\@cclvi - \else\@tempdima=\z@ - \fi -% \end{macrocode} -% $B%"%/%;%s%H$,IU$/!VK\BN$NJ8;z!W$,2$J8J8;z$H?dB,$5$l$k>l9g$K$O!"(B -% $B0lC6?t<0%b!<%I$KF~$k$3$H$K$h$C$F(B\cs{xkanjiskip}$B$,A08e$KF~$k$h$&$K$7$^$9!#(B -% $BI,MW$J$i!"?t<0%b!<%I$NA08e$K(B\cs{null}$B$rJd$C$F(B\cs{xkanjiskip}$B$NA^F~$rM^@)$7$^$9!#(B -% \begin{macrocode} - \ifnum\@tempcntb<\@cclvi - \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi - \ifodd\xspcode\@tempcntb\else\leavevmode\hbox{}\fi - \fi\fi - \begingroup\mathsurround\z@$% - \ifx\textbaselineshiftfactor\@undefined\else - \textbaselineshiftfactor\z@\fi - \box\z@ - $\endgroup% - \ifnum\@tempcntb>\m@ne\ifnum\@tempcntb<\@cclvi - \ifnum\xspcode\@tempcntb<2\hbox{}\fi - \fi\fi -% \end{macrocode} -% \begin{macrocode} - \else - \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\leavevmode\lower\@tempdima\box\z@\fi - \fi - \endgroup}% - \fi -} -% -%\plEndIncludeInRelease -% \end{macrocode} -% \end{macro} -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2016/09/03)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{$B;YCl(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B} -% -% p\LaTeXe{}$B%+!<%M%k(B(2016/11/29)$B$KF3F~$7$?$?$a:o=|!#(B -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % \section{$B2~9T(B} % % $B6/@)2~9T(B|\\|$B$H(B|\par|$B$,O"B3$7$?>l9g$N5sF0$K$D$$$F$O0J2<$N$H$*$jJ]N1Cf!#(B @@ -344,20 +201,14 @@ % \end{macrocode} % \end{macro} % -% $B9TF,6XB'J8;z$NA0$G$N(B|\linebreak|$B$N5sF0$N=$@5$O!"(B -% p\LaTeXe{}$B%+!<%M%k(B(2017/05/05)$B$KF3F~$7$?$?$a:o=|!#(B -% -% $B>e5-$N=$@5$K$h$j(B|\nolinebreak|$B$G(B|\(x)kanjiskip|$B$,(B -% $BF~$i$J$/$J$C$F$$$?%P%0$N=$@5$O!"(B -% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29+1)$B$KF3F~$7$?$?$a:o=|!#(B +% |\linebreak|$B$N5sF0$N=$@5$O!"%P%0$,AjH(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B -% -% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$N=$@5$K2C$(!"0J2<$N=$@5$r8!F$Cf$G$9$,!"(B +% $B8=;~E@$G$OJ]N1$7$F$$$^$9!#(B % % \begin{macro}{\@setref@} % $B$5$i$K!";2>H$7$?7k2L$,!V6u!W$N>l9g(B @@ -381,59 +232,81 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} +% \section{$B5SCm$N9g0uD>8e$G$N2~9T$r5v2D(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2016/09/03$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{$B2<@~%^%/%m(B} +% \section{e-p\TeX{}$B$G$N(BFAM256$B%Q%C%A$NMxMQ(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2016/11/29$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B} +% \section{$B;YCl(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/04/08)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{verb$B$NKAF,$N%9%Z!<%9(B} +% \section{$B5SCm$H%\%H%`%U%m!<%H$N=g=x$*$h$S?bD>0LCV(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B} +% \section{\cs{textunderscore}$B$N%Y!<%9%i%$%sJd@5(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/04/08$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B} +% \section{verbatim$B$H%O%$%U%M!<%7%g%s(B} +% +% 2017/04/08$B$KF3F~:Q$_!#(B % -% p\LaTeXe{}$B%+!<%M%k(B(2017/07/29)$B$KF3F~$7$?$?$a:o=|!#(B +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{\cs{verb}$B$NKAF,$N%9%Z!<%9(B} % -% $B$5$i$J$k=$@5$b(Bp\LaTeXe{}$B%+!<%M%k(B(2018/03/09)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{tabbing$B4D6-$N9TKAF,$N(BJFM$B%0%k!=(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{\cs{inhibitglue}$B$N4JN,7A(B} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % \section{$B%$%?%j%C%/Jd@5$H(B\cs{xkanjiskip}} % -% p\LaTeXe{}$B%+!<%M%k(B(2017/10/28)$B$KF3F~$7$?$?$a:o=|!#(B +% 2017/10/28$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \subsection{$BD>A0$N(BJFM$BM3Mh%9%Z!<%9$N:o=|!Z%3%_%e%K%F%#HGFH<+![(B} +% +% 2018/03/09$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{tabular$B4D6-$N%;%kFb$N(BJFM$B%0%k!=(B} +% +% 2018/03/09$B$KF3F~:Q$_!#(B +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \section{PDF$B$N%V%C%/%^!<%/$H%"%/%;%s%HJ8;z(B} +% +% 2018/07/28$B$KF3F~:Q$_!#(B % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jarticle.cls 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jarticle.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jarticle} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -764,7 +764,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk10.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk10.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk11.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk11.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbk12.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbk12.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jbk12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbook.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jbook.cls 2018-04-07 20:56:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jbook.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jbook} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -867,7 +867,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jreport.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jreport.cls 2018-04-07 20:56:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jreport.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{jreport} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -863,7 +863,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize10.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize10.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize11.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize11.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jsize12.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jsize12.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{jsize12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jt1gt.fd texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jt1gt.fd --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jt1gt.fd 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jt1gt.fd 2018-07-28 22:03:37.000000000 +0000 @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jt1gt.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JT1}{gt}{} \DeclareRelationFont{JT1}{gt}{m}{}{OT1}{cmr}{bx}{} \DeclareFontShape{JT1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*tgoth @@ -22,6 +22,7 @@ <-> tgoth10 }{} \DeclareFontShape{JT1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jt1gt.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jt1mc.fd texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jt1mc.fd --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jt1mc.fd 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jt1mc.fd 2018-07-28 22:03:37.000000000 +0000 @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jt1mc.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JT1}{mc}{} \DeclareRelationFont{JT1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JT1}{mc}{bx}{}{OT1}{cmr}{bx}{} @@ -23,6 +23,7 @@ <-> tmin10 }{} \DeclareFontShape{JT1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT1}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jt1mc.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jy1gt.fd texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jy1gt.fd --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jy1gt.fd 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jy1gt.fd 2018-07-28 22:03:37.000000000 +0000 @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jy1gt.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JY1}{gt}{} \DeclareRelationFont{JY1}{gt}{m}{}{OT1}{cmr}{bx}{} \DeclareFontShape{JY1}{gt}{m}{n}{<5> <6> <7> <8> <9> <10> sgen*goth @@ -22,6 +22,7 @@ <-> goth10 }{} \DeclareFontShape{JY1}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jy1gt.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jy1mc.fd texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jy1mc.fd --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/jy1mc.fd 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/jy1mc.fd 2018-07-28 22:03:37.000000000 +0000 @@ -14,7 +14,7 @@ %% %% File: plfonts.dtx \ProvidesFile{jy1mc.fd} - [2018/02/04 v1.6l KANJI font defines] + [2018/07/03 v1.6q KANJI font defines] \DeclareKanjiFamily{JY1}{mc}{} \DeclareRelationFont{JY1}{mc}{m}{}{OT1}{cmr}{m}{} \DeclareRelationFont{JY1}{mc}{bx}{}{OT1}{cmr}{bx}{} @@ -23,6 +23,7 @@ <-> min10 }{} \DeclareFontShape{JY1}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY1}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jy1mc.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/platexrelease.sty texlive-lang-2018.20180824/texmf-dist/tex/platex/base/platexrelease.sty --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/platexrelease.sty 2018-05-20 21:31:08.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/platexrelease.sty 2018-07-28 22:03:37.000000000 +0000 @@ -18,7 +18,7 @@ \edef\p@known@latexreleaseversion {2018-04-01} \edef\platexreleaseversion - {2018-05-20} + {2018-07-28} \newif\if@plincludeinrelease \@plincludeinreleasefalse \def\plIncludeInRelease#1{% @@ -68,7 +68,7 @@ %% File: platexrelease.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesPackage{platexrelease} - [2018/04/06 v1.0l latexrelease support for pLaTeX Kernel + [2018/05/22 v1.0m latexrelease support for pLaTeX Kernel (including releases up to \platexreleaseversion)] \RequirePackageWithOptions{latexrelease} \ifnum\expandafter\@parse@version\latexreleaseversion//00\@nil @@ -81,10 +81,12 @@ \def\@plIncludeInRelease#1[#2]{\@plIncludeInRele@se{#1}}% \let\requestedplpatchdate\CurrentOption} \DeclareOption{latest}{% - \let\requestedplpatchdate\platexreleaseversion} + \let\requestedplpatchdate\platexreleaseversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} \DeclareOption{current}{% - \let\requestedplpatchdate\pfmtversion} -\ExecuteOptions{current} + \let\requestedplpatchdate\pfmtversion + \AtEndOfPackage{\def\requestedpLaTeXdate{0}}} +\let\requestedplpatchdate\pfmtversion \ProcessOptions\relax \def\reserved@a{% \edef\requestedpLaTeXdate{\the\count@}% @@ -131,6 +133,7 @@ some critical bugs. We advise you to\MessageBreak select another format date} \plIncludeInRelease{2017/10/28}{\PackageWarning}{pLaTeX Info}% + % * <2018-07-28> % * <2018-05-20> % * <2018-04-01>+2 % * <2018-04-01>+1 @@ -401,6 +404,47 @@ \iftdir\raise-\tbaselineshift\fi \vbox{\hrule\@width.3em}} \plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@saved@oalign} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@oalign} + {Fix for non-zero baselineshift}% +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@oalign} + {Fix for non-zero baselineshift}% +\let\pltx@oalign\@undefined +\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\pltx@saved@ltx@sh@ft} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@ltx@sh@ft} + {Fix for non-zero baselineshift}% +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\pltx@ltx@sh@ft} + {Fix for non-zero baselineshift}% +\let\pltx@ltx@sh@ft\@undefined +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\g@tlastchart@} {Added \g@tlastchart@}% \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} @@ -409,6 +453,34 @@ {Added \g@tlastchart@}% \let\g@tlastchart@\@undefined \plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@isletter} + {Support PD1 encoding}% +\def\pltx@mark{\pltx@mark@} +\let\pltx@scanstop\relax +\long\def\pltx@cond#1\fi{% + #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} +\long\def\pltx@isletter#1{% + \expandafter\pltx@isletter@i#1\pltx@scanstop} +\long\def\pltx@isletter@i#1\pltx@scanstop{% + \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi{\@firstoftwo}% + {\pltx@isletter@ii\pltx@scanstop#1\pltx@scanstop{}#1\pltx@mark}} +\long\def\pltx@isletter@ii#1\pltx@scanstop#{% + \pltx@cond\ifx\pltx@mark#1\pltx@mark\fi% + {\pltx@isletter@iii}{\pltx@isletter@iv}} +\long\def\pltx@isletter@iii#1\pltx@mark{\@secondoftwo} +\long\def\pltx@isletter@iv#1#2#3\pltx@mark{% + \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% + \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} +\plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\pltx@isletter} {Added \pltx@isletter}% \def\pltx@mark{\pltx@mark@} @@ -435,13 +507,13 @@ \let\pltx@isletter\@undefined \plEndIncludeInRelease \plIncludeInRelease{2016/06/10}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease \plIncludeInRelease{2016/04/17}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3#{% \begingroup \setbox\z@=\hbox\bgroup% @@ -450,24 +522,57 @@ \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease \plIncludeInRelease{0000/00/00}{\@text@composite} - {Wrong fix for non-zero baselineshift}% + {Fix for non-zero baselineshift (wrong)}% \def\@text@composite#1#2#3\@text@composite{% \expandafter\@text@composite@x \csname\string#1-\string#2\endcsname} \plEndIncludeInRelease -\plIncludeInRelease{2016/07/01}{\@text@composite@x} - {Fix for non-zero baselineshift}% -\def\@text@composite@x#1{% +%\plIncludeInRelease{0000/00/00}{\pltx@saved@text@composite@x} +% {Special case! (This block is required for any emulation date)}% +\def\pltx@saved@text@composite@x#1{% \ifx#1\relax \expandafter\@secondoftwo \else \expandafter\@firstoftwo \fi #1} +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\pltx@text@composite@x} + {Fix for non-zero baselineshift}% +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} \plEndIncludeInRelease -\plIncludeInRelease{2016/06/10}{\@text@composite@x} +\plIncludeInRelease{2016/06/10}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1#2{% +\def\pltx@text@composite@x#1#2{% \ifx#1\relax #2% \else\pltx@isletter{#1}{#1}{% @@ -506,15 +611,15 @@ \fi\fi \else \ifdim\@tempdima=\z@{\ybaselineshift\z@\tbaselineshift\z@#1}% - \else\lower\@tempdima\box\z@\fi + \else\leavevmode\lower\@tempdima\box\z@\fi \fi \endgroup}% \fi } \plEndIncludeInRelease -\plIncludeInRelease{2016/04/17}{\@text@composite@x} +\plIncludeInRelease{2016/04/17}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1#2{% +\def\pltx@text@composite@x#1#2{% \ifx#1\relax \expandafter\@secondoftwo \else @@ -535,15 +640,66 @@ \box\z@ \endgroup} \plEndIncludeInRelease -\plIncludeInRelease{0000/00/00}{\@text@composite@x} +\plIncludeInRelease{0000/00/00}{\pltx@text@composite@x} {Fix for non-zero baselineshift}% -\def\@text@composite@x#1{% - \ifx#1\relax - \expandafter\@secondoftwo - \else - \expandafter\@firstoftwo - \fi - #1} +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +%\plIncludeInRelease{0000/00/00}{\@text@composite@x} +% {Special case! (This block is required for any emulation date)}% +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent +%\plEndIncludeInRelease +\plIncludeInRelease{2018/07/28}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (conditional default) +% other commands are actually defined for pLaTeX2e 2018-07-28 +\plEndIncludeInRelease +\plIncludeInRelease{2016/07/01}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (always) +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{2016/04/17}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\fixcompositeaccent % force pLaTeX definition (always) +\let\oalign\pltx@saved@oalign % no fix at that time +\let\ltx@sh@ft\pltx@saved@ltx@sh@ft % no fix at that time +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined +\plEndIncludeInRelease +\plIncludeInRelease{0000/00/00}{\fixcompositeaccent} + {Fix for non-zero baselineshift}% +\nofixcompositeaccent % force LaTeX original (always) +\let\fixcompositeaccent\@undefined +\let\nofixcompositeaccent\@undefined +\let\pltx@saved@oalign\@undefined +\let\pltx@oalign\@undefined +\let\pltx@saved@ltx@sh@ft\@undefined +\let\pltx@ltx@sh@ft\@undefined +\let\pltx@saved@text@composite@x\@undefined +\let\pltx@text@composite@x\@undefined \plEndIncludeInRelease \plIncludeInRelease{2017/10/28}{\check@nocorr@} {Italic correction before \textt...}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/plcore.ltx texlive-lang-2018.20180824/texmf-dist/tex/platex/base/plcore.ltx --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/plcore.ltx 2018-05-20 21:31:08.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/plcore.ltx 2018-07-28 22:03:37.000000000 +0000 @@ -33,7 +33,7 @@ \fi \def\pfmtname{pLaTeX2e} \def\pfmtversion - {2018-05-20} + {2018-07-28} \def\ppatch@level{0} \edef\platexBANNER{\noexpand\platexNILa \the\everyjob % LaTeX banner and delayed codes @@ -738,11 +738,39 @@ \else\tbaselineshift\fi \else\ybaselineshift\fi \vbox{\hrule\@width.3em}} +\def\pltx@saved@oalign#1{\leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}} +\def\pltx@oalign#1{\ifmmode + \leavevmode\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}% +\else + \iftdir\ybaselineshift\tbaselineshift\fi + \m@th$\hbox{\vtop{\baselineskip\z@skip \lineskip.25ex% + \ialign{##\crcr#1\crcr}}}$% +\fi} +\def\pltx@saved@ltx@sh@ft #1{% + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant +\def\pltx@ltx@sh@ft #1{% + \ybaselineshift\z@ + \dimen@ #1% + \kern \strip@pt + \fontdimen1\font \dimen@ + } % kern by #1 times the current slant \def\g@tlastchart@#1{#1\ifx\lastnodechar\@undefined\m@ne\else\lastnodechar\fi} \def\pltx@mark{\pltx@mark@} \let\pltx@scanstop\relax \long\def\pltx@cond#1\fi{% #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi} +\def\pltx@pdfencA{PD1} +\def\pltx@composite@chkenc{% + \ifx\pltx@pdfencA\f@encoding + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} \long\def\pltx@isletter#1{% \expandafter\pltx@isletter@i#1\pltx@scanstop} \long\def\pltx@isletter@i#1\pltx@scanstop{% @@ -755,8 +783,56 @@ \long\def\pltx@isletter@iv#1#2#3\pltx@mark{% \pltx@cond\ifx\pltx@mark#3\pltx@mark\fi{% \pltx@cond{\ifnum0\ifcat A\noexpand#21\fi\ifcat=\noexpand#21\fi>\z@}\fi - {\@firstoftwo}{\@secondoftwo}% - }{\@secondoftwo}} + {\@firstoftwo}{\pltx@composite@chkenc}% + }{\pltx@composite@chkenc}} +\def\pltx@saved@text@composite@x#1{% + \ifx#1\relax + \expandafter\@secondoftwo + \else + \expandafter\@firstoftwo + \fi + #1} +\def\pltx@text@composite@x#1#2{% + \ifx#1\relax + #2% + \else\pltx@isletter{#1}{#1}{% + \begingroup + \setbox\z@\hbox\bgroup + \ybaselineshift\z@\tbaselineshift\z@ + #1% + \g@tlastchart@\@tempcntb + \xdef\pltx@composite@temp{\noexpand\@tempcntb=\the\@tempcntb\relax}% + \aftergroup\pltx@composite@temp + \egroup + \ifnum\@tempcntb<\@cclvi + \ifnum\@tempcntb>\m@ne + \ifodd\xspcode\@tempcntb\else\leavevmode\null\fi + \fi + \begingroup\m@th$% + \ifx\textbaselineshiftfactor\@undefined\else + \textbaselineshiftfactor\z@\fi + \box\z@ + $\endgroup + \ifnum\@tempcntb>\m@ne + \ifnum\xspcode\@tempcntb<2\null\fi + \fi + \else + {\ybaselineshift\z@\tbaselineshift\z@#1}% + \fi + \endgroup}% + \fi +} +\DeclareRobustCommand\fixcompositeaccent{% + \let\oalign\pltx@oalign + \let\ltx@sh@ft\pltx@ltx@sh@ft + \let\@text@composite@x\pltx@text@composite@x +} +\DeclareRobustCommand\nofixcompositeaccent{% + \let\oalign\pltx@saved@oalign + \let\ltx@sh@ft\pltx@saved@ltx@sh@ft + \let\@text@composite@x\pltx@saved@text@composite@x +} +\nofixcompositeaccent %% File: plcore.dtx \def\NeedsTeXFormat#1{% \def\reserved@a{#1}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tarticle.cls 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tarticle.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tarticle} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -768,7 +768,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk10.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk10.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk11.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk11.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbk12.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbk12.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tbk12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbook.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tbook.cls 2018-04-07 20:56:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tbook.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{tbook} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -871,7 +871,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/treport.cls texlive-lang-2018.20180824/texmf-dist/tex/platex/base/treport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/treport.cls 2018-04-07 20:56:23.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/treport.cls 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{treport} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -867,7 +867,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if$B@>Nq(B \$B@>Nq(Bfalse +\newif\if$B@>Nq(B \$B@>Nq(Btrue \def\$B@>Nq(B{\$B@>Nq(Btrue} \def\$BOBNq(B{\$B@>Nq(Bfalse} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize10.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize10.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize10.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize11.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize11.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize11.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/platex/base/tsize12.clo 2018-03-09 22:46:10.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/base/tsize12.clo 2018-07-28 22:03:37.000000000 +0000 @@ -15,7 +15,7 @@ %% File: jclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{tsize12.clo} - [2018/02/04 v1.7h + [2018/07/03 v1.8 Standard pLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/platex/pxrubrica/pxrubrica.sty texlive-lang-2018.20180824/texmf-dist/tex/platex/pxrubrica/pxrubrica.sty --- texlive-lang-2018.20180725/texmf-dist/tex/platex/pxrubrica/pxrubrica.sty 2017-11-19 22:17:51.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/platex/pxrubrica/pxrubrica.sty 2018-08-17 22:07:02.000000000 +0000 @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pxrubrica} - [2017/11/19 v1.3b PX Japanese-style ruby] + [2018/08/16 v1.3c PX Japanese-style ruby] \RequirePackage{keyval} \def\pxrr@pkgname{pxrubrica} \def\pxrr@error{% @@ -90,7 +90,7 @@ } \def\pxrr@fatal@bad@movable{% \pxrr@fatal@error{% - Novable group ruby is not allowed here% + Movable group ruby is not allowed here% }\pxrr@eh@fatal } \def\pxrr@fatal@na@movable{% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib texlive-lang-2018.20180824/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib --- texlive-lang-2018.20180725/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib 2016-11-25 18:34:06.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/ptex/ptex-base/eptexdefs.lib 2018-08-18 21:18:32.000000000 +0000 @@ -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 -Nru texlive-lang-2018.20180725/texmf-dist/tex/ptex/ptex-base/ptex.tex texlive-lang-2018.20180824/texmf-dist/tex/ptex/ptex-base/ptex.tex --- texlive-lang-2018.20180725/texmf-dist/tex/ptex/ptex-base/ptex.tex 2017-04-17 22:25:33.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/ptex/ptex-base/ptex.tex 2018-08-18 21:18:32.000000000 +0000 @@ -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 -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jt2gt.fd texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jt2gt.fd --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jt2gt.fd 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jt2gt.fd 2018-07-28 22:05:54.000000000 +0000 @@ -15,11 +15,12 @@ %% %% File: uplfonts.dtx \ProvidesFile{jt2gt.fd} - [2018/02/04 v1.6l-u02 KANJI font defines] + [2018/07/03 v1.6q-u02 KANJI font defines] \DeclareKanjiFamily{JT2}{gt}{} \DeclareRelationFont{JT2}{gt}{m}{}{T1}{cmr}{bx}{} \DeclareFontShape{JT2}{gt}{m}{n}{<->s*[0.962216]upjisg-v}{} \DeclareFontShape{JT2}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT2}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jt2gt.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jt2mc.fd texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jt2mc.fd --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jt2mc.fd 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jt2mc.fd 2018-07-28 22:05:54.000000000 +0000 @@ -15,12 +15,13 @@ %% %% File: uplfonts.dtx \ProvidesFile{jt2mc.fd} - [2018/02/04 v1.6l-u02 KANJI font defines] + [2018/07/03 v1.6q-u02 KANJI font defines] \DeclareKanjiFamily{JT2}{mc}{} \DeclareRelationFont{JT2}{mc}{m}{}{T1}{cmr}{m}{} \DeclareRelationFont{JT2}{mc}{bx}{}{T1}{cmr}{bx}{} \DeclareFontShape{JT2}{mc}{m}{n}{<->s*[0.962216]upjisr-v}{} \DeclareFontShape{JT2}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JT2}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jt2mc.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jy2gt.fd texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jy2gt.fd --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jy2gt.fd 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jy2gt.fd 2018-07-28 22:05:54.000000000 +0000 @@ -15,11 +15,12 @@ %% %% File: uplfonts.dtx \ProvidesFile{jy2gt.fd} - [2018/02/04 v1.6l-u02 KANJI font defines] + [2018/07/03 v1.6q-u02 KANJI font defines] \DeclareKanjiFamily{JY2}{gt}{} \DeclareRelationFont{JY2}{gt}{m}{}{T1}{cmr}{bx}{} \DeclareFontShape{JY2}{gt}{m}{n}{<->s*[0.962216]upjisg-h}{} \DeclareFontShape{JY2}{gt}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY2}{gt}{b}{n}{<->ssub*gt/bx/n}{} \endinput %% %% End of file `jy2gt.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jy2mc.fd texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jy2mc.fd --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/jy2mc.fd 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/jy2mc.fd 2018-07-28 22:05:54.000000000 +0000 @@ -15,12 +15,13 @@ %% %% File: uplfonts.dtx \ProvidesFile{jy2mc.fd} - [2018/02/04 v1.6l-u02 KANJI font defines] + [2018/07/03 v1.6q-u02 KANJI font defines] \DeclareKanjiFamily{JY2}{mc}{} \DeclareRelationFont{JY2}{mc}{m}{}{T1}{cmr}{m}{} \DeclareRelationFont{JY2}{mc}{bx}{}{T1}{cmr}{bx}{} \DeclareFontShape{JY2}{mc}{m}{n}{<->s*[0.962216]upjisr-h}{} \DeclareFontShape{JY2}{mc}{bx}{n}{<->ssub*gt/m/n}{} +\DeclareFontShape{JY2}{mc}{b}{n}{<->ssub*mc/bx/n}{} \endinput %% %% End of file `jy2mc.fd'. diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujarticle.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujarticle.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujarticle} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -765,7 +765,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk10.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk10.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk10.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk11.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk11.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk11.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbk12.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbk12.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujbk12.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbook.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujbook.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujbook.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujbook} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -868,7 +868,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujreport.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujreport.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujreport.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{ujreport} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -864,7 +864,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1em \noindent\hb@xt@ 1.8em{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize10.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize10.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize10.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize11.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize11.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize11.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/ujsize12.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/ujsize12.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{ujsize12.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utarticle.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utarticle.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utarticle.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utarticle.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utarticle} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -769,7 +769,7 @@ \kern2.6\p@} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk10.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk10.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk10.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk10.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk11.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk11.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk11.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk11.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk12.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbk12.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbk12.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utbk12.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbook.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbook.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utbook.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utbook.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utbook} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -872,7 +872,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utreport.cls texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utreport.cls --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utreport.cls 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utreport.cls 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesClass{utreport} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX class] \newcounter{@paper} \newif\if@landscape \@landscapefalse @@ -868,7 +868,7 @@ \@addtoreset{footnote}{chapter} \newcommand\@makefntext[1]{\parindent 1zw \noindent\hb@xt@ 2zw{\hss\@makefnmark}#1} -\newif\if西暦 \西暦false +\newif\if西暦 \西暦true \def\西暦{\西暦true} \def\和暦{\西暦false} \newcount\heisei \heisei\year \advance\heisei-1988\relax diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize10.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize10.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize10.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize10.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize10.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize11.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize11.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize11.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize11.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize11.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize12.clo texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize12.clo --- texlive-lang-2018.20180725/texmf-dist/tex/uplatex/base/utsize12.clo 2018-03-09 22:46:27.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/uplatex/base/utsize12.clo 2018-07-28 22:05:54.000000000 +0000 @@ -16,7 +16,7 @@ %% File: ujclasses.dtx \NeedsTeXFormat{pLaTeX2e} \ProvidesFile{utsize12.clo} - [2018/02/04 v1.7h-u00 + [2018/07/03 v1.8-u00 Standard upLaTeX file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/adjmulticol-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/algorithm2e-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsart-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsbook-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsmath-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amstext-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/amsthm-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/array-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/article-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel1-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel2-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/artikel3-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/arydshln-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi2in1.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi2in1.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi2in1.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi2in1.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidicode.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidicode.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidicode.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidicode.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidiftnxtra.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi-media9.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi-media9.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi-media9.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi-media9.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidimoderncv.cls 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidipoem.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidipoem.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidipoem.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidipoem.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -35,8 +35,8 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\def\bididate{2018/06/15} -\def\bidi@version{33.0} +\def\bididate{2018/08/12} +\def\bidi@version{33.1} \ProvidesPackage{bidi}[\bididate\space v\bidi@version\space Bidirectional typesetting in plain TeX and LaTeX] \edef\@bidi@info{****************************************************^^J% @@ -58,9 +58,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/bidi^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/bidi/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \typeout{\@bidi@info} @@ -118,6 +118,10 @@ \newcommand*{\@bidi@pdfproducer}{% The bidi package, v\bidi@version, \bididate } +\newcommand*{\@bidi@pdfcustomproperties}{% + This is the bidi package, Version \bidi@version, + Released August 12, 2018. +} \@RTLmainfalse \AtBeginDocument{% \if@RTLmain\else @@ -272,14 +276,18 @@ \XeTeXinterchartoks \bidi@sepmark@charclass \bidi@digits@charclass = {\DigitsDotDashInterCharToks} \newcommand*{\DigitsDotDashInterCharToks}{\if@nonlatin\char"200F \fi} \AtEndDocument{% - \if@bidi@pdfm@mark - \special{pdf:% - docinfo<<% - /Creator(\@bidi@pdfcreator)% - /Producer(\@bidi@pdfproducer)% + \special{pdf:% + docinfo<<% + \if@bidi@pdfm@mark + /Creator(\@bidi@pdfcreator)% + /Producer(\@bidi@pdfproducer)% + \fi + /BIDI.Fullbanner(\@bidi@pdfcustomproperties)% + \if@bidi@csdef{@xepersian@pdfcustomproperties}{% + /XEPERSIAN.Fullbanner(\@xepersian@pdfcustomproperties)% + }{}% >>% }% - \fi } \endinput %% diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi.tex texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi.tex --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidi.tex 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidi.tex 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -34,9 +34,9 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -\def\bididate{2018/06/15} +\def\bididate{2018/08/12} \catcode`@=11 -\def\bidi@version{33.0} +\def\bidi@version{33.1} \let \protect \relax \newlinechar`\^^J \edef\@bidi@info{****************************************************^^J% @@ -58,9 +58,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/bidi^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/bidi/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \message{\@bidi@info} @@ -133,15 +133,20 @@ \def\@bidi@pdfproducer{% The bidi package, v\bidi@version, \bididate } +\def\@bidi@pdfcustomproperties{% + This is the bidi package, Version \bidi@version, + Released August 12, 2018. +} \def\bidi@pdfm@mark{% - \if@bidi@pdfm@mark - \special{pdf:% - docinfo<<% - /Creator(\@bidi@pdfcreator)% - /Producer(\@bidi@pdfproducer)% + \special{pdf:% + docinfo<<% + \if@bidi@pdfm@mark + /Creator(\@bidi@pdfcreator)% + /Producer(\@bidi@pdfproducer)% + \fi + /BIDI.Fullbanner(\@bidi@pdfcustomproperties)% >>% }% - \fi } \def\bidipdfinfoon{\@bidi@pdfm@marktrue} \def\bidipdfinfooff{\@bidi@pdfm@markfalse} diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditools.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditools.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditools.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditools.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditufte-book.cls texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditufte-book.cls --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditufte-book.cls 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditufte-book.cls 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftefloat.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftegeneralstructure.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/biditufte-handout.cls 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftehyperref.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftesidenote.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftetitle.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bidituftetoc.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/boek3-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/boek-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/bookest-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/book-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/breqn-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cals-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/caption3-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/caption-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/colortbl-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/color-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/combine-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/crop-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cuted-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cutwin-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cvthemebidicasual.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/cvthemebidiclassic.sty 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/dblfnote-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/diagbox-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/draftwatermark-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/empheq-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/eso-pic-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extarticle-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extbook-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extletter-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extrafootnotefeatures-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/extreport-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fancybox-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fancyhdr-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fix2col-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/fleqn-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/floatrow-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/float-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/flowfram-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/footnote-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/framed-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ftnright-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/geometry-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/graphicx-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/hvfloat-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/hyperref-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/imsproc-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/latex-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/leqno-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/letter-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/lettrine-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/lineno-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/listings-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/loadingorder-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/longtable-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/mathtools-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/mdframed-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/memoir-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/midfloat-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/minitoc-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/multicol-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/multienum-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/natbib-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/newfloat-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ntheorem-hyper-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ntheorem-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/overpic-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pdfbase-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pdfpages-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pgfcorescopes.code-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/picinpar-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/plain-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/pstricks-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/quotchap-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/ragged2e-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rapport1-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rapport3-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/refrep-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/report-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/rotating-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrartcl-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrbook-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrlettr-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/scrreprt-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/sidecap-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/soul-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/stabular-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/subfigure-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabls-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabularx-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tabulary-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tcolorbox-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tc-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/titlesec-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/titletoc-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocbasic-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocbibind-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocloft-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/tocstyle-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/todonotes-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/wrapfig-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/xcolor-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def 2018-06-15 21:10:05.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/bidi/xltxtra-xetex-bidi.def 2018-08-12 21:58:02.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{49812} +%% \CheckSum{49822} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/algorithmic-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/algorithm-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/amsart-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/amsbook-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/appendix-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/article-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/article-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/article-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/article-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel1-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel2-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/artikel3-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/backref-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bidimoderncv-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bidituftesidenote-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/boek3-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/boek-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/bookest-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/book-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/book-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/book-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/book-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/breqn-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/color-localise-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/enumerate-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/enumitem-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extarticle-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extbook-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extrafootnotefeatures-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/extreport-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/flowfram-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/footnote-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/framed-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/glossaries-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/hyperref-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/imsproc-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/kashida-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-commands-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-environments-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-messages-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/latex-localise-misc-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/listings-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/loadingorder-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/localise-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/memoir-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/minitoc-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/natbib-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/packages-localise-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/rapport1-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/rapport3-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/refrep-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/report-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/report-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/report-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/report-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrartcl-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrbook-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/scrreprt-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/soul-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/tkz-linknodes-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/tocloft-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-localise-commands-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-localise-environments-xepersian.def 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-magazine.cls 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-mathsdigitspec.sty 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-multiplechoice.sty 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian-persiancal.sty 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z diff -Nru texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian.sty texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian.sty --- texlive-lang-2018.20180725/texmf-dist/tex/xelatex/xepersian/xepersian.sty 2018-06-15 21:09:32.000000000 +0000 +++ texlive-lang-2018.20180824/texmf-dist/tex/xelatex/xepersian/xepersian.sty 2018-08-12 21:57:25.000000000 +0000 @@ -17,7 +17,7 @@ %% by Vafa Khalighi. %% %% -%% \CheckSum{10607} +%% \CheckSum{10620} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -35,8 +35,8 @@ %% Right brace \} Tilde \~} %% \NeedsTeXFormat{LaTeX2e} -\def\xepersian@version{21.2} -\def\xepersiandate{2018/06/15} +\def\xepersian@version{21.3} +\def\xepersiandate{2018/08/12} \ProvidesPackage{xepersian}[\xepersiandate\space v\xepersian@version\space Persian typesetting in XeLaTeX] \RequirePackage{fontspec} @@ -60,9 +60,9 @@ * ^^J% * Location on CTAN: /macros/xetex/latex/xepersian^^J% * ^^J% -* Issue tracker: https://gitlab.com/persian-tex/xepersian/issues^^J% +* Issue tracker: https://sourceforge.net/p/persian-tex-dist/tickets^^J% * ^^J% -* Support: persian-tex@tug.org^^J% +* Support: http://persian-tex.com^^J% * ^^J% ****************************************************} \typeout{\@xepersian@info} @@ -122,23 +122,23 @@ \DeclareDocumentCommand \settextfont { O{} m O{} } { \__xepersian_main_settextfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_settextfont:nn { - \fontspec_set_family:Nnn \g__xepersian_persianfont_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \rmdefault \g__xepersian_persianfont_family + \fontspec_set_family:Nnn \l__xepersian_persianfont_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \rmdefault \l__xepersian_persianfont_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persianfont } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persianfont_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persianfont_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\rmdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_settextfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_settextfont_hook:nn \use_none:nn @@ -146,16 +146,17 @@ \DeclareDocumentCommand \settextdigitfont { O{} m O{} } { \__xepersian_main_settextdigitfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_settextdigitfont:nn { - \fontspec_set_family:Nnn \g__xepersian_textdigitfont_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \fontspec_set_family:Nnn \l__xepersian_textdigitfont_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} \use:x { \exp_not:n { \DeclareRobustCommand \xepersian@textdigitfont } { - \exp_not:N \fontfamily { \g__xepersian_textdigitfont_family } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_textdigitfont_family_tl } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -188,27 +189,28 @@ { \__xepersian_main_settextdigitfont:nn {#1,#3} {#2} \__xepersian_main_setmathdigitfont:nn {#1,#3} {#2} + \ignorespaces } \DeclareDocumentCommand \setlatintextfont { O{} m O{} } { \__xepersian_main_setlatintextfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setlatintextfont:nn { - \fontspec_set_family:Nnn \g__xepersian_latinfont_family {Mapping=tex-text,#1} {#2} + \fontspec_set_family:Nnn \l__xepersian_latinfont_family_tl {Mapping=tex-text,#1} {#2} \use:x { \exp_not:n { \DeclareRobustCommand \latinfont } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_latinfont_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_latinfont_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\rmdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setlatintextfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setlatintextfont_hook:nn \use_none:nn @@ -218,17 +220,23 @@ \DeclareDocumentCommand \defpersianfont { m O{} m O{} } { - \__xepersian_main_defpersianfont:nnn {#1} {#2,#4} {#3} + \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3} + \NewDocumentCommand } -\cs_new:Nn \__xepersian_main_defpersianfont:nnn +\DeclareDocumentCommand \redefpersianfont { m O{} m O{} } + { + \__xepersian_main_defpersianfont:nnnN {#1} {#2,#4} {#3} + \RenewDocumentCommand + } +\cs_new:Nn \__xepersian_main_defpersianfont:nnnN { - \fontspec_set_family:cnn { g__xepersian_ \cs_to_str:N #1 _family } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2} {#3} + \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Script=Parsi,Language=Parsi,Mapping=parsidigits,#2} {#3} \use:x { - \exp_not:N \DeclareRobustCommand \exp_not:N #1 + \exp_not:N #4 \exp_not:N #1 {} { - \exp_not:N \fontfamily { \use:c {g__xepersian_ \cs_to_str:N #1 _family} } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \use:c {l__xepersian_ \cs_to_str:N #1 _family_tl } } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -236,17 +244,23 @@ \DeclareDocumentCommand \deflatinfont { m O{} m O{} } { - \__xepersian_main_deflatinfont:nnn {#1} {#2,#4} {#3} + \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3} + \NewDocumentCommand + } +\DeclareDocumentCommand \redeflatinfont { m O{} m O{} } + { + \__xepersian_main_deflatinfont:nnnN {#1} {#2,#4} {#3} + \RenewDocumentCommand } -\cs_new:Nn \__xepersian_main_deflatinfont:nnn +\cs_new:Nn \__xepersian_main_deflatinfont:nnnN { - \fontspec_set_family:cnn { g__xepersian_ \cs_to_str:N #1 _family } {Mapping=tex-text,#2} {#3} + \fontspec_set_family:cnn { l__xepersian_ \cs_to_str:N #1 _family_tl } {Mapping=tex-text,#2} {#3} \use:x { - \exp_not:N \DeclareRobustCommand \exp_not:N #1 + \exp_not:N #4 \exp_not:N #1 {} { - \exp_not:N \fontfamily { \use:c {g__xepersian_ \cs_to_str:N #1 _family} } - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \use:c {l__xepersian_ \cs_to_str:N #1 _family_tl } } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } \exp_not:N \selectfont } } @@ -286,23 +300,23 @@ \DeclareDocumentCommand \setpersiansansfont { O{} m O{} } { \__xepersian_main_setpersiansansfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpersiansansfont:nn { - \fontspec_set_family:Nnn \g__xepersian_persiansffamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \persiansfdefault \g__xepersian_persiansffamily_family + \fontspec_set_family:Nnn \l__xepersian_persiansffamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \persiansfdefault \l__xepersian_persiansffamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persiansffamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persiansffamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persiansffamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\persiansfdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpersiansansfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpersiansansfont_hook:nn \use_none:nn @@ -310,23 +324,23 @@ \DeclareDocumentCommand \setpersianmonofont { O{} m O{} } { \__xepersian_main_setpersianmonofont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpersianmonofont:nn { - \fontspec_set_family:Nnn \g__xepersian_persianttfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \persianttdefault \g__xepersian_persianttfamily_family + \fontspec_set_family:Nnn \l__xepersian_persianttfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \persianttdefault \l__xepersian_persianttfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \persianttfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_persianttfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_persianttfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\persianttdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpersianmonofont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpersianmonofont_hook:nn \use_none:nn @@ -334,23 +348,23 @@ \DeclareDocumentCommand \setnavarfont { O{} m O{} } { \__xepersian_main_setnavarfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setnavarfont:nn { - \fontspec_set_family:Nnn \g__xepersian_navarfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \navardefault \g__xepersian_navarfamily_family + \fontspec_set_family:Nnn \l__xepersian_navarfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \navardefault \l__xepersian_navarfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \navarfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_navarfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_navarfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\navardefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setnavarfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setnavarfont_hook:nn \use_none:nn @@ -358,23 +372,23 @@ \DeclareDocumentCommand \setpookfont { O{} m O{} } { \__xepersian_main_setpookfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setpookfont:nn { - \fontspec_set_family:Nnn \g__xepersian_pookfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \pookdefault \g__xepersian_pookfamily_family + \fontspec_set_family:Nnn \l__xepersian_pookfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \pookdefault \l__xepersian_pookfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \pookfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_pookfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_pookfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\pookdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setpookfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setpookfont_hook:nn \use_none:nn @@ -382,23 +396,23 @@ \DeclareDocumentCommand \setsayehfont { O{} m O{} } { \__xepersian_main_setsayehfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setsayehfont:nn { - \fontspec_set_family:Nnn \g__xepersian_sayehfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \sayehdefault \g__xepersian_sayehfamily_family + \fontspec_set_family:Nnn \l__xepersian_sayehfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \sayehdefault \l__xepersian_sayehfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \sayehfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_sayehfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_sayehfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\sayehdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setsayehfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setsayehfont_hook:nn \use_none:nn @@ -406,23 +420,23 @@ \DeclareDocumentCommand \setiranicfont { O{} m O{} } { \__xepersian_main_setiranicfont:nn {#1,#3} {#2} + \ignorespaces } \cs_new:Nn \__xepersian_main_setiranicfont:nn { - \fontspec_set_family:Nnn \g__xepersian_iranicfamily_family {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} - \tl_set_eq:NN \iranicdefault \g__xepersian_iranicfamily_family + \fontspec_set_family:Nnn \l__xepersian_iranicfamily_family_tl {Script=Parsi,Language=Parsi,Mapping=parsidigits,#1} {#2} + \tl_set_eq:NN \iranicdefault \l__xepersian_iranicfamily_family_tl \use:x { \exp_not:n { \DeclareRobustCommand \iranicfamily } { - \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } - \exp_not:N \fontfamily { \g__xepersian_iranicfamily_family } + \exp_not:N \fontencoding { \g__fontspec_nfss_enc_tl } + \exp_not:N \fontfamily { \l__xepersian_iranicfamily_family_tl } \exp_not:N \selectfont } } \str_if_eq_x:nnT {\familydefault} {\iranicdefault} - { \tl_set_eq:NN \encodingdefault \l__fontspec_nfss_enc_tl } + { \tl_set_eq:NN \encodingdefault \g__fontspec_nfss_enc_tl } \__xepersian_setiranicfont_hook:nn {#1} {#2} \normalfont - \ignorespaces } \cs_set_eq:NN \__xepersian_setiranicfont_hook:nn \use_none:nn @@ -812,6 +826,11 @@ The xepersian package, v\xepersian@version, \xepersiandate } +\newcommand*{\@xepersian@pdfcustomproperties}{% + This is the xepersian package, Version \xepersian@version, + Released August 12, 2018. +} + \newcommand\twocolumnstableofcontents{% \if@bidi@csundef{multi@column@out}{% \PackageError{xepersian}{Oops! you should load multicol package before xepersian package for being able to use this command}{}}{% diff -Nru texlive-lang-2018.20180725/tlpkg/installer/config.guess texlive-lang-2018.20180824/tlpkg/installer/config.guess --- texlive-lang-2018.20180725/tlpkg/installer/config.guess 2018-05-22 00:23:33.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/installer/config.guess 2018-07-21 00:24:25.000000000 +0000 @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-05-19' +timestamp='2018-07-18' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,8 +84,6 @@ exit 1 fi -trap 'exit 1' 1 2 15 - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -96,30 +94,35 @@ # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 +trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 + +set_cc_for_build() { + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$driver" + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -138,7 +141,7 @@ # We could probably try harder. LIBC=gnu - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -199,7 +202,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -389,20 +392,15 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" - SUN_ARCH=i386 - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH=x86_64 - fi - fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" + UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" + case `isainfo -b` in + 32) + echo i386-pc-solaris2"$UNAME_REL" + ;; + 64) + echo x86_64-pc-solaris2"$UNAME_REL" + ;; + esac exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -482,7 +480,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -579,7 +577,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -660,7 +658,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -700,7 +698,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -726,7 +724,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -840,6 +838,17 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; + arm*:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi + else + echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf + fi + exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -894,8 +903,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix + *:Minix:*:*) + echo "$UNAME_MACHINE"-unknown-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -922,7 +931,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -971,7 +980,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1285,7 +1294,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" + set_cc_for_build if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1358,6 +1367,7 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. + # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TeXCatalogue.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TeXCatalogue.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TeXCatalogue.pm 2016-11-25 18:34:12.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TeXCatalogue.pm 2018-06-24 02:09:05.000000000 +0000 @@ -1,6 +1,6 @@ -# $Id: TeXCatalogue.pm 37525 2015-06-14 13:37:35Z preining $ +# $Id: TeXCatalogue.pm 48080 2018-06-24 02:09:05Z preining $ # TeXLive::TeXCatalogue - module for accessing the TeX Catalogue -# Copyright 2007-2015 Norbert Preining +# Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # @@ -13,7 +13,7 @@ package TeXLive::TeXCatalogue::Entry; -my $svnrev = '$Revision: 37525 $'; +my $svnrev = '$Revision: 48080 $'; my $_modulerevision; if ($svnrev =~ m/: ([0-9]+) /) { $_modulerevision = $1; @@ -47,6 +47,7 @@ version => $params{'version'}, also => defined($params{'also'}) ? $params{'also'} : [], topic => defined($params{'topic'}) ? $params{'topic'} : [], + alias => defined($params{'alias'}) ? $params{'alias'} : [], }; bless $self, $class; if (defined($self->{'ioref'})) { @@ -77,6 +78,12 @@ if ($parser->findvalue('/entry/miktex/@location') ne "") { $self->{'miktex'} = $parser->findvalue('/entry/miktex/@location')->value(); } + # parse all alias entries + my $alset = $parser->find('/entry/alias'); + for my $node ($alset->get_nodelist) { + my $id = $parser->find('./@id', $node); + push @{$self->{'alias'}}, "$id"; + } # parse the documentation entries my $docset = $parser->find('/entry/documentation'); foreach my $node ($docset->get_nodelist) { @@ -170,6 +177,12 @@ if (@_) { $self->{'entry'} = \%newentry } return $self->{'entry'}; } +sub alias { + my $self = shift; + my @newalias = @_; + if (@_) { $self->{'alias'} = \@newalias } + return $self->{'alias'}; +} sub also { my $self = shift; my @newalso = @_; diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLConfig.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLConfig.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLConfig.pm 2018-06-06 01:35:10.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLConfig.pm 2018-07-19 01:29:33.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLConfig.pm 47938 2018-06-06 01:35:10Z preining $ +# $Id: TLConfig.pm 48225 2018-07-19 01:29:33Z preining $ # TeXLive::TLConfig.pm - module exporting configuration values # Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLConfig; -my $svnrev = '$Revision: 47938 $'; +my $svnrev = '$Revision: 48225 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -22,19 +22,12 @@ $MetaCategoriesRegexp $CategoriesRegexp $DefaultCategory - $DefaultFallbackDownloader @AcceptedFallbackDownloaders %FallbackDownloaderProgram %FallbackDownloaderArgs $DefaultCompressorFormat - $DefaultContainerExtension - @AcceptedCompressors - $AcceptedCompressorsRegexp - %CompressorProgram - %DecompressorProgram - %CompressorArgs - %DecompressorArgs - %CompressorExtension + $CompressorExtRegexp + %Compressors $InfraLocation $DatabaseName $PackageBackupDir @@ -118,26 +111,39 @@ } # -our $DefaultFallbackDownloader = "wget"; our @AcceptedFallbackDownloaders = qw/curl wget/; our %FallbackDownloaderProgram = ( 'wget' => 'wget', 'curl' => 'curl'); our %FallbackDownloaderArgs = ( - 'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', + 'curl' => ['--user-agent', 'texlive/curl', '--retry', '10', '--fail', '--location', '--connect-timeout', "$NetworkTimeout", '--silent', '--output'], 'wget' => ['--user-agent=texlive/wget', '--tries=10', "--timeout=$NetworkTimeout", '-q', '-O'], ); # the way we package things on the web our $DefaultCompressorFormat = "xz"; -our $DefaultContainerExtension = "tar.$DefaultCompressorFormat"; -# mind that the order here is important as gives also the preference! -our @AcceptedCompressors = qw/lz4 gzip xz/; -our $AcceptedCompressorsRegexp = "(xz|lz4|gzip)"; -our %CompressorProgram = ( 'xz' => 'xz', 'gzip' => 'gzip', 'lz4' => 'lz4'); -our %CompressorExtension = ( 'xz' => 'xz', 'gzip' => 'gz', 'lz4' => 'lz4'); -our %CompressorArgs = ( 'xz' => ['-zf'], 'gzip' => [ '-f' ], 'lz4' => ['-zfm', '--rm', '-q']); -our %DecompressorProgram = ( 'xz' => 'xz', 'gzip' => 'gzip', 'lz4' => 'lz4'); -our %DecompressorArgs = ( 'xz' => ['-dcf'], 'gzip' => ['-dcf'], 'lz4' => ['-dcf']); +# priority defines which compressor is selected for backups/rollback containers +# less is better +our %Compressors = ( + "lz4" => { + "decompress_args" => ["-dcf"], + "compress_args" => ["-zfmq", "--rm"], + "extension" => "lz4", + "priority" => 10, + }, + "gzip" => { + "decompress_args" => ["-dcf"], + "compress_args" => ["-f"], + "extension" => "gz", + "priority" => 20, + }, + "xz" => { + "decompress_args" => ["-dcf"], + "compress_args" => ["-zf"], + "extension" => "xz", + "priority" => 30, + }, +); +our $CompressorExtRegexp = "(" . join("|", map { $Compressors{$_}{'extension'} } keys(%Compressors)) . ")"; # archive (not user) settings. # these can be overridden by putting them into 00texlive.config.tlpsrc diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLCrypto.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLCrypto.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLCrypto.pm 2018-06-03 18:13:18.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLCrypto.pm 2018-07-03 22:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLCrypto.pm 47909 2018-06-03 18:13:18Z karl $ +# $Id: TLCrypto.pm 48130 2018-07-03 22:24:07Z preining $ # TeXLive::TLCrypto.pm - handle checksums and signatures. # Copyright 2016-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -12,7 +12,7 @@ use TeXLive::TLUtils qw(debug ddebug win32 which platform conv_to_w32_path tlwarn tldie); -my $svnrev = '$Revision: 47909 $'; +my $svnrev = '$Revision: 48130 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -252,6 +252,17 @@ debug("verify_checksum: download did not succeed for $checksum_url\n"); return($VS_CONNECTION_ERROR, "download did not succeed: $checksum_url"); } + + # check that we have a non-trivial size for the checksum file + # the size should be at least 128 + 1 + length(filename) > 129 + { + my $css = -s $checksum_file; + if ($css <= 128) { + debug("verify_checksum: size of checksum file suspicious: $css\n"); + return($VS_CONNECTION_ERROR, "download corrupted: $checksum_url"); + } + } + # check the signature my ($ret, $msg) = verify_signature($checksum_file, $checksum_url); @@ -418,6 +429,26 @@ my $signature_file = TeXLive::TLUtils::download_to_temp_or_file($signature_url); if ($signature_file) { + { + # we expect a signature to be at least + # 30 header line + 30 footer line + 256 > 300 + my $sigsize = -s $signature_file; + if ($sigsize < 300) { + debug("cryptographic signature seems to be corrupted (size $sigsize<300): $signature_url, $signature_file\n"); + return($VS_UNSIGNED, "cryptographic signature download seems to be corrupted (size $sigsize<300)"); + } + } + # check also the first line of the signature file for + # -----BEGIN PGP SIGNATURE----- + { + open my $file, '<', $signature_file; + chomp(my $firstLine = <$file>); + close $file; + if ($firstLine !~ m/^-----BEGIN PGP SIGNATURE-----/) { + debug("cryptographic signature seems to be corrupted (first line not signature): $signature_url, $signature_file, $firstLine\n"); + return($VS_UNSIGNED, "cryptographic signature download seems to be corrupted (first line of $signature_url not signature: $firstLine)"); + } + } my ($ret, $out) = gpg_verify_signature($file, $signature_file); if ($ret == 1) { # no need to show the output diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLPDB.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLPDB.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLPDB.pm 2018-05-25 03:40:14.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLPDB.pm 2018-07-05 18:05:05.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLPDB.pm 47834 2018-05-25 03:40:14Z preining $ +# $Id: TLPDB.pm 48144 2018-07-05 18:05:05Z karl $ # TeXLive::TLPDB.pm - tlpdb plain text database files. # Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLPDB; -my $svnrev = '$Revision: 47834 $'; +my $svnrev = '$Revision: 48144 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -91,15 +91,13 @@ use TeXLive::TLConfig qw($CategoriesRegexp $DefaultCategory $InfraLocation $DatabaseName $MetaCategoriesRegexp $Archive - $DefaultCompressorFormat $DefaultContainerExtension - @AcceptedCompressors $AcceptedCompressorsRegexp %CompressorProgram - %CompressorExtension %CompressorArgs %DecompressorProgram %DecompressorArgs + $DefaultCompressorFormat %Compressors $CompressorExtRegexp %TLPDBOptions %TLPDBSettings $ChecksumExtension $RelocPrefix $RelocTree); use TeXLive::TLCrypto; use TeXLive::TLPOBJ; use TeXLive::TLUtils qw(dirname mkdirhier member win32 info log debug ddebug - tlwarn basename download_file merge_into tldie); + tlwarn basename download_file merge_into tldie system_pipe); use TeXLive::TLWinGoo; use Cwd 'abs_path'; @@ -316,26 +314,16 @@ ($tlpdbfh, $tlpdbfile) = TeXLive::TLUtils::tl_tmpfile(); # same as above close($tlpdbfh); - my $tlpdbfile_quote = $tlpdbfile; - if (win32()) { - $tlpdbfile =~ s!/!\\!g; - } - $tlpdbfile_quote = "\"$tlpdbfile\""; # if we have xz available we try the xz file my $xz_succeeded = 0 ; my $compressorextension = ""; - if (defined($::progs{$DecompressorProgram{$DefaultCompressorFormat}})) { + if (defined($::progs{$DefaultCompressorFormat})) { # we first try the xz compressed file my ($xzfh, $xzfile) = TeXLive::TLUtils::tl_tmpfile(); close($xzfh); - my $xzfile_quote = $xzfile; - if (win32()) { - $xzfile =~ s!/!\\!g; - } - $xzfile_quote = "\"$xzfile\""; - my $decompressor = TeXLive::TLUtils::quotify_path_with_spaces($::progs{$DecompressorProgram{$DefaultCompressorFormat}}); - $compressorextension = $CompressorExtension{$DefaultCompressorFormat}; - my @decompressorArgs = @{$DecompressorArgs{$DefaultCompressorFormat}}; + my $decompressor = $::progs{$DefaultCompressorFormat}; + $compressorextension = $Compressors{$DefaultCompressorFormat}{'extension'}; + my @decompressorArgs = @{$Compressors{$DefaultCompressorFormat}{'decompress_args'}}; debug("trying to download $path.$compressorextension to $xzfile\n"); my $ret = TeXLive::TLUtils::download_file("$path.$compressorextension", "$xzfile"); # better to check both, the return value AND the existence of the file @@ -345,12 +333,10 @@ # xz *hopefully* returns 0 on success and anything else on failure # we don't have to negate since not zero means error in the shell # and thus in perl true - if (system("$decompressor @decompressorArgs <$xzfile_quote >$tlpdbfile_quote")) { + if (!system_pipe($decompressor, $xzfile, $tlpdbfile, 1, @decompressorArgs)) { debug("$decompressor $xzfile failed, trying plain file\n"); - # to be sure we unlink the xz file and the tlpdbfile - unlink($xzfile); + unlink($xzfile); # the above command only removes in case of success } else { - unlink($xzfile); $xz_succeeded = 1; debug("found the uncompressed $DefaultCompressorFormat file\n"); } @@ -384,7 +370,7 @@ } elsif ($r == $VS_CONNECTION_ERROR) { tldie("$0: cannot download: $m\n"); } elsif ($r == $VS_UNSIGNED) { - debug("$0: remote database checksum is not signed, continuing anyway!\n"); + debug("$0: remote database checksum is not signed, continuing anyway: $m\n"); $self->verification_status($r); } elsif ($r == $VS_GPG_UNAVAILABLE) { debug("$0: TLPDB: no gpg available, continuing anyway!\n"); @@ -808,7 +794,7 @@ } # we have to be careful here: If a package # is only present in a subsidiary repository - # and the package is *not* explicitely + # and the package is *not* explicitly # pinned to it, it will not be installable. # This is what we want. But in this case # we don't want it to be listed by default. @@ -1080,7 +1066,7 @@ push @lop, $d; } } else { - # speudo dependencies on $Package.ARCH can be ignored + # pseudo-dependencies on $Package.ARCH can be ignored if ($d !~ m/\.ARCH$/) { tlwarn("TLPDB: package $tlp->name depends on $d, but this does not exist\n"); } @@ -1114,7 +1100,7 @@ print TMP "*Title: ", $tlp->shortdesc, "\n"; my $s = 0; # schemes size includes ONLY those packages which are directly - # included and direclty included files, not the size of the + # included and directly included files, not the size of the # included collections. But if a package is included in one of # the called for collections AND listed directly, we don't want # to count its size two times @@ -1274,7 +1260,7 @@ =item C<< $tlpdb->listdir >> The function C allows to read and set the packages variable -specifiying where generated list files are created. +specifying where generated list files are created. =cut @@ -1822,17 +1808,17 @@ if ($media eq 'local_uncompressed') { $container = \@installfiles; } elsif ($media eq 'local_compressed') { - for my $ext (@AcceptedCompressors) { + for my $ext (map { $Compressors{$_}{'extension'} } keys %Compressors) { if (-r "$root/$Archive/$pkg.tar.$ext") { $container = "$root/$Archive/$pkg.tar.$ext"; } } if (!$container) { - tlwarn("TLPDB: cannot find package $pkg.tar.$AcceptedCompressorsRegexp in $root/$Archive\n"); + tlwarn("TLPDB: cannot find package $pkg.tar.$CompressorExtRegexp in $root/$Archive\n"); return(0); } } elsif (&media eq 'NET') { - $container = "$root/$Archive/$pkg.$DefaultContainerExtension"; + $container = "$root/$Archive/$pkg.tar." . $Compressors{$DefaultCompressorFormat}{'extension'}; } debug("TLPDB::not_virtual_install_package: trying to install $container\n"); $self->_install_data ($container, $reloc, \@installfiles, $totlpdb, $tlpobj->containersize, $tlpobj->containerchecksum) @@ -1853,13 +1839,13 @@ # - there are actually src/doc files present if ($container_src_split && $opt_src && $tlpobj->srcfiles) { my $srccontainer = $container; - $srccontainer =~ s/\.tar\.$AcceptedCompressorsRegexp$/.source.tar.$1/; + $srccontainer =~ s/\.tar\.$CompressorExtRegexp$/.source.tar.$1/; $self->_install_data ($srccontainer, $reloc, \@installfiles, $totlpdb, $tlpobj->srccontainersize, $tlpobj->srccontainerchecksum) || return(0); } if ($container_doc_split && $real_opt_doc && $tlpobj->docfiles) { my $doccontainer = $container; - $doccontainer =~ s/\.tar\.$AcceptedCompressorsRegexp$/.doc.tar.$1/; + $doccontainer =~ s/\.tar\.$CompressorExtRegexp$/.doc.tar.$1/; $self->_install_data ($doccontainer, $reloc, \@installfiles, $totlpdb, $tlpobj->doccontainersize, $tlpobj->doccontainerchecksum) || return(0); } @@ -1979,7 +1965,7 @@ } # we always assume that copy will work return(1); - } elsif ($what =~ m,\.tar\.$AcceptedCompressorsRegexp$,) { + } elsif ($what =~ m,\.tar\.$CompressorExtRegexp$,) { if ($reloc) { if (!$totlpdb->setting("usertree")) { $target .= "/$RelocTree"; @@ -2078,7 +2064,7 @@ } else { # NO NOTHING HERE!!! # DON'T PUSH IT ON @goodfiles, it will be removed, which we do - # NOT want. We only want to supress the warning! + # NOT want. We only want to suppress the warning! push @debugfiles, $f; } } else { diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLPOBJ.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLPOBJ.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLPOBJ.pm 2018-06-05 22:35:41.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLPOBJ.pm 2018-06-23 18:36:00.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLPOBJ.pm 47934 2018-06-05 22:35:41Z karl $ +# $Id: TLPOBJ.pm 48076 2018-06-23 18:36:00Z preining $ # TeXLive::TLPOBJ.pm - module for using tlpobj files # Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -6,15 +6,13 @@ package TeXLive::TLPOBJ; -my $svnrev = '$Revision: 47934 $'; +my $svnrev = '$Revision: 48076 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } use TeXLive::TLConfig qw($DefaultCategory $CategoriesRegexp $MetaCategoriesRegexp $InfraLocation - @AcceptedCompressors %CompressorArgs - %CompressorProgram %CompressorExtension - $DefaultCompressorFormat + %Compressors $DefaultCompressorFormat $RelocPrefix $RelocTree); use TeXLive::TLCrypto; use TeXLive::TLTREE; @@ -718,21 +716,25 @@ if ($type ne 'tar') { # compress it - my $compressor = $::progs{$CompressorProgram{$type}}; + my $compressor = $::progs{$type}; if (!defined($compressor)) { # fall back to $type as compressor, but that shouldn't happen tlwarn("$0: programs not set up, trying \"$type\".\n"); $compressor = $type; } - my @compressorargs = @{$CompressorArgs{$type}}; - my $compressorextension = $CompressorExtension{$type}; + my @compressorargs = @{$Compressors{$type}{'compress_args'}}; + my $compressorextension = $Compressors{$type}{'extension'}; $containername = "$tarname.$compressorextension"; debug("selected compressor: $compressor with @compressorargs, " . "on $destdir/$tarname\n"); # compress it. if (-r "$destdir/$tarname") { - system($compressor, @compressorargs, "$destdir/$tarname"); + # system return 0 on success + if (system($compressor, @compressorargs, "$destdir/$tarname")) { + tlwarn("$0: Couldn't compress $destdir/$tarname\n"); + return (0,0, ""); + } } else { tlwarn("$0: Couldn't find $destdir/$tarname to run $compressor\n"); return (0, 0, ""); @@ -820,7 +822,7 @@ $foo =~ s/^.Date: //; # trying to extract the interesting part of a subversion date # keyword expansion here, e.g., - # $Date: 2018-06-06 00:35:41 +0200 (Wed, 06 Jun 2018) $ + # $Date: 2018-06-23 20:36:00 +0200 (Sat, 23 Jun 2018) $ # ->2007-08-15 19:43:35 +0100 $foo =~ s/ \(.*\)( *\$ *)$//; # maybe nothing after parens $self->cataloguedata->{'date'} = $foo; @@ -842,6 +844,9 @@ if (@{$entry->also}) { $self->cataloguedata->{'also'} = "@{$entry->also}"; } + if (@{$entry->alias}) { + $self->cataloguedata->{'alias'} = "@{$entry->alias}"; + } if (@{$entry->topics}) { $self->cataloguedata->{'topics'} = "@{$entry->topics}"; } diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLPSRC.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLPSRC.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLPSRC.pm 2017-05-11 18:08:47.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLPSRC.pm 2018-07-05 21:20:15.000000000 +0000 @@ -1,6 +1,6 @@ -# $Id: TLPSRC.pm 44293 2017-05-11 18:08:47Z karl $ +# $Id: TLPSRC.pm 48145 2018-07-05 21:20:15Z karl $ # TeXLive::TLPSRC.pm - module for handling tlpsrc files -# Copyright 2007-2017 Norbert Preining +# Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. @@ -12,19 +12,12 @@ use TeXLive::TLPOBJ; use TeXLive::TLTREE; -my $_tmp; -my %autopatterns; # computed once internally +my $svnrev = '$Revision: 48145 $'; +my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; +sub module_revision { return $_modulerevision; } -my $svnrev = '$Revision: 44293 $'; -my $_modulerevision; -if ($svnrev =~ m/: ([0-9]+) /) { - $_modulerevision = $1; -} else { - $_modulerevision = "unknown"; -} -sub module_revision { - return $_modulerevision; -} +my $_tmp; # sorry +my %autopatterns; # computed once internally sub new { my $class = shift; @@ -72,7 +65,6 @@ close(TMP); my $name = $pkgname; - # default category = Package my $category = "Package"; my $shortdesc = ""; my $longdesc= ""; @@ -84,13 +76,13 @@ my $finished = 0; my $savedline = ""; my %tlpvars; + $tlpvars{"PKGNAME"} = $name; my $lineno = 0; for my $line (@lines) { $lineno++; - # we allow continuation lines in tlpsrc files, i.e., lines with a \ at - # the end + # we allow continuation lines in tlpsrc files, i.e., lines ending with \. if ($line =~ /^(.*)\\$/) { $savedline .= $1; next; @@ -104,75 +96,102 @@ $line =~ /^\s*#/ && next; # skip comment lines next if $line =~ /^\s*$/; # skip blank lines # (blank lines are significant in tlpobj, but not tlpsrc) - - if ($line =~ /^ /) { - die "$srcfile:$lineno: non-continuation indentation not allowed: `$line'"; - } - # remove terminal white space + # + $line =~ /^ / + && die "$srcfile:$lineno: non-continuation indentation not allowed: `$line'"; + # + # remove trailing white space. $line =~ s/\s+$//; + + # expand tlpvars while reading in (except in descriptions). + # that means we have to respect *order* and define variables + # as we read the tlpsrc file. + if ($line !~ /^(short|long)desc\s/) { + #debug: my $origline = $line; + for my $k (keys %tlpvars) { + $line =~ s/\$\{\Q$k\E\}/$tlpvars{$k}/g; + } + # check that no variables remain unexpanded, or rather, for any + # remaining $ (which we don't otherwise allow in tlpsrc files, so + # should never occur) ... except for ${ARCH} which we specially + # expand in TLTREE.pm. (Sigh: we distribute one file dvi$pdf.bat, + # but fortunately it is matched by a directory.) + # + (my $testline = $line) =~ s,\$\{ARCH\},,g; + $testline =~ /\$/ + && die "$srcfile:$lineno: variable undefined or syntax error: $line\n"; + #debug: warn "new line $line, from $origline\n" if $origline ne $line; + } # end variable expansion. + # names of source packages can either be # - normal names: ^[-\w]+$ # - win32 specific packages: ^[-\w]+\.win32$ # - normal texlive specific packages: ^texlive.*\..*$ # - configuration texlive specific packages: ^00texlive.*\..*$ - if ($line =~ /^name\s*([-\w]+(\.win32)?|00texlive.*|texlive\..*)$/) { + if ($line =~ /^name\s/) { + $line =~ /^name\s+([-\w]+(\.win32)?|(00)?texlive\..*)$/; + $foundnametag + && die "$srcfile:$lineno: second name directive not allowed: $line" + . "(have $name)\n"; $name = $1; - $foundnametag && die "$srcfile: second name directive not allowed: $name"; $foundnametag = 1; + # let's assume that $PKGNAME doesn't occur before any name + # directive (which would result in different expansions); there is + # no need for it in practice. + $tlpvars{"PKGNAME"} = $name; + + } elsif ($line =~ /^category\s+$CategoriesRegexp$/) { + $category = $1; + + } elsif ($line =~ /^shortdesc\s*(.*)$/) { + # although we would like to do this, hyphen-latin.tlpsrc contains + # multiple short/longdesc entries. Not worth following up. + # $shortdesc + # && die "$srcfile:$lineno: second shortdesc not allowed: $line" + # . "(have $shortdesc)\n"; + $shortdesc = $1; + + } elsif ($line =~ /^shortdesc$/) { + $shortdesc = ""; + + } elsif ($line =~ /^longdesc$/) { + $longdesc .= "\n"; + + } elsif ($line =~ /^longdesc\s+(.*)$/) { + $longdesc .= "$1 "; + + } elsif ($line =~ /^catalogue\s+(.*)$/) { + $catalogue + && die "$srcfile:$lineno: second catalogue not allowed: $line" + . "(have $catalogue)\n"; + $catalogue = $1; + + } elsif ($line =~ /^runpattern\s+(.*)$/) { + push (@runpatterns, $1) if ($1 ne ""); + + } elsif ($line =~ /^srcpattern\s+(.*)$/) { + push (@srcpatterns, $1) if ($1 ne ""); + + } elsif ($line =~ /^docpattern\s+(.*)$/) { + push (@docpatterns, $1) if ($1 ne ""); + + } elsif ($line =~ /^binpattern\s+(.*)$/) { + push (@binpatterns, $1) if ($1 ne ""); + + } elsif ($line =~ /^execute\s+(.*)$/) { + push (@executes, $1) if ($1 ne ""); + + } elsif ($line =~ /^depend\s+(.*)$/) { + push (@depends, $1) if ($1 ne ""); + + } elsif ($line =~ /^postaction\s+(.*)$/) { + push (@postactions, $1) if ($1 ne ""); + + } elsif ($line =~ /^tlpsetvar\s+([-_a-zA-Z0-9]+)\s+(.*)$/) { + $tlpvars{$1} = $2; + } else { - # expand tlpvars while reading in - # that means we have to respect *order* and define variables - # first in the tlpsrc file - for my $k (keys %tlpvars) { - $line =~ s/\$\{\Q$k\E\}/$tlpvars{$k}/g; - } - # we default to the file name as package name - # $started || die "$srcfile: first directive must be `name', not $line"; - if ($line =~ /^shortdesc\s*(.*)$/) { - $shortdesc = $1; - next; - } elsif ($line =~ /^shortdesc$/) { - $shortdesc = ""; - next; - } elsif ($line =~ /^category\s+$CategoriesRegexp$/) { - $category = $1; - next; - } elsif ($line =~ /^longdesc$/) { - $longdesc .= "\n"; - next; - } elsif ($line =~ /^longdesc\s+(.*)$/) { - $longdesc .= "$1 "; - next; - } elsif ($line =~ /^catalogue\s+(.*)$/) { - $catalogue = $1; - next; - } elsif ($line =~ /^runpattern\s+(.*)$/) { - push @runpatterns, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^srcpattern\s+(.*)$/) { - push @srcpatterns, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^docpattern\s+(.*)$/) { - push @docpatterns, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^binpattern\s+(.*)$/) { - push @binpatterns, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^execute\s+(.*)$/) { - push @executes, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^depend\s+(.*)$/) { - push @depends, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^postaction\s+(.*)$/) { - push @postactions, $1 if ($1 ne ""); - next; - } elsif ($line =~ /^tlpsetvar\s+([-_a-zA-Z0-9]+)\s+(.*)$/) { - $tlpvars{$1} = $2; - next; - } else { - tlwarn("$srcfile:$lineno: unknown tlpsrc directive, fix fix: $line\n"); - } + die "$srcfile:$lineno: unknown tlpsrc directive, fix: $line\n"; } } $self->_srcfile($srcfile); @@ -1042,8 +1061,8 @@ =item Architecture expansion -In case the string C<${>I} occurs in one C it is -automatically expanded to the respective architecture. +Within a binpattern, the string C<${ARCH}> is automatically expanded to +all available architectures. =item C for Windows diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLTREE.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLTREE.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLTREE.pm 2018-06-03 18:09:29.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLTREE.pm 2018-07-05 21:20:15.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLTREE.pm 47907 2018-06-03 18:09:29Z karl $ +# $Id: TLTREE.pm 48145 2018-07-05 21:20:15Z karl $ # TeXLive::TLTREE.pm - work with the tree of all files # Copyright 2007-2018 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@ -6,13 +6,8 @@ package TeXLive::TLTREE; -my $svnrev = '$Revision: 47907 $'; -my $_modulerevision; -if ($svnrev =~ m/: ([0-9]+) /) { - $_modulerevision = $1; -} else { - $_modulerevision = "unknown"; -} +my $svnrev = '$Revision: 48145 $'; +my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } use TeXLive::TLUtils; @@ -324,13 +319,21 @@ sub get_matching_files { my ($self, $type, $p, $pkg, $arch) = @_; my $ARCH = $arch; - my $PKGNAME = $pkg; my $newp; - eval "\$newp = \"$p\""; - if (!defined($newp)) { - print "Huuu: cannot generate newp from p: p=$p, pkg=$pkg, arch=$arch, type=$type\n"; + { + my $warnstr = ""; + local $SIG{__WARN__} = sub { $warnstr = $_[0]; }; + eval "\$newp = \"$p\""; + if (!defined($newp)) { + die "cannot set newp from p: p=$p, pkg=$pkg, arch=$arch, type=$type"; + } + if ($warnstr) { + tlwarn("Warning `$warnstr' while evaluating: $p " + . "(pkg=$pkg, arch=$arch, type=$type), returning empty list\n"); + return (); + } } - return($self->_get_matching_files($type,$newp)); + return $self->_get_matching_files($type,$newp); } diff -Nru texlive-lang-2018.20180725/tlpkg/TeXLive/TLUtils.pm texlive-lang-2018.20180824/tlpkg/TeXLive/TLUtils.pm --- texlive-lang-2018.20180725/tlpkg/TeXLive/TLUtils.pm 2018-05-31 16:50:47.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/TeXLive/TLUtils.pm 2018-07-20 13:40:24.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: TLUtils.pm 47887 2018-05-31 16:50:47Z karl $ +# $Id: TLUtils.pm 48233 2018-07-20 13:40:24Z preining $ # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live. # Copyright 2007-2018 Norbert Preining, Reinhard Kotucha # This file is licensed under the GNU General Public License version 2 @@ -6,7 +6,7 @@ package TeXLive::TLUtils; -my $svnrev = '$Revision: 47887 $'; +my $svnrev = '$Revision: 48233 $'; my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown"; sub module_revision { return $_modulerevision; } @@ -39,6 +39,7 @@ TeXLive::TLUtils::wsystem($msg,@args); TeXLive::TLUtils::xsystem(@args); TeXLive::TLUtils::run_cmd($cmd); + TeXLive::TLUtils::system_pipe($prog, $infile, $outfile, $removeIn, @extraargs); =head2 File utilities @@ -177,6 +178,7 @@ &wsystem &xsystem &run_cmd + &system_pipe &announce_execute_actions &add_symlinks &remove_symlinks @@ -202,7 +204,7 @@ ); @EXPORT = qw(setup_programs download_file process_logging_options tldie tlwarn info log debug ddebug dddebug debug_hash - win32 xchdir xsystem run_cmd sort_archs); + win32 xchdir xsystem run_cmd system_pipe sort_archs); } use Cwd; @@ -623,6 +625,37 @@ return ($output,$retval); } +=item C + +Runs C<$prog> with C<@extraargs> redirecting stdin from C<$infile>, stdout to C<$outfile>. +Removes C<$infile> if C<$removeIn> is true. + +=cut + +sub system_pipe { + my ($prog, $infile, $outfile, $removeIn, @extraargs) = @_; + + my $progQuote = quotify_path_with_spaces($prog); + if (win32()) { + $infile =~ s!/!\\!g; + $outfile =~ s!/!\\!g; + } + my $infileQuote = "\"$infile\""; + my $outfileQuote = "\"$outfile\""; + debug("TLUtils::system_pipe: calling $progQuote @extraargs < $infileQuote > $outfileQuote\n"); + my $retval = system("$progQuote @extraargs < $infileQuote > $outfileQuote"); + if ($retval != 0) { + $retval /= 256 if $retval > 0; + debug("TLUtils::system_pipe: system exit code = $retval\n"); + return 0; + } else { + if ($removeIn) { + debug("TLUtils::system_pipe: removing $infile\n"); + unlink($infile); + } + return 1; + } +} =back @@ -2136,31 +2169,23 @@ return (0, "nothing to unpack"); } - my $type; + my $decompressorType; my $compressorextension; - for my $comptype (@AcceptedCompressors) { - my $ext = $CompressorExtension{$comptype}; - if ($what =~ m/\.tar\.$ext$/) { - $type = $comptype; - $compressorextension = $ext; - } + if ($what =~ m/\.tar\.$CompressorExtRegexp$/) { + $compressorextension = $1; + $decompressorType = $1 eq "gz" ? "gzip" : $1; } - if (!$type) { + if (!$decompressorType) { return(0, "don't know how to unpack"); } # make sure that the found uncompressor type is also available - if (!member($type, @{$::progs{'working_compressors'}})) { - return(0, "unsupported container format $type"); + if (!member($decompressorType, @{$::progs{'working_compressors'}})) { + return(0, "unsupported container format $decompressorType"); } # only check the necessary compressor program - my $decompressor = TeXLive::TLUtils::quotify_path_with_spaces( - $::progs{$DecompressorProgram{$type}}); - my @decompressorArgs = @{$DecompressorArgs{$type}}; - if (!defined($decompressor)) { - return (0, "programs not set up properly"); - } - + my $decompressor = $::progs{$decompressorType}; + my @decompressorArgs = @{$Compressors{$decompressorType}{'decompress_args'}}; my $fn = basename($what); my $pkg = $fn; @@ -2169,17 +2194,6 @@ my $containerfile = "$tempdir/$fn"; my $tarfile = "$tempdir/$fn"; $tarfile =~ s/\.$compressorextension$//; - my $containerfile_quote; - my $tarfile_quote; - my $target_quote; - if (win32()) { - $containerfile =~ s!/!\\!g; - $tarfile =~ s!/!\\!g; - $target =~ s!/!\\!g; - } - $containerfile_quote = "\"$containerfile\""; - $tarfile_quote = "\"$tarfile\""; - $target_quote = "\"$target\""; if ($what =~ m,^(https?|ftp)://, || $what =~ m!$SshURIRegex!) { # we are installing from the NET # check for the presence of $what in $tempdir @@ -2210,14 +2224,12 @@ # we can remove it afterwards $remove_containerfile = 1; } - debug("decompressing $containerfile to $tarfile\n"); - debug("calling $decompressor @decompressorArgs < $containerfile_quote > $tarfile_quote\n"); - system("$decompressor @decompressorArgs < $containerfile_quote > $tarfile_quote"); - if (! -f $tarfile) { + if (!system_pipe($decompressor, $containerfile, $tarfile, $remove_container, @decompressorArgs) + || + ! -f $tarfile) { unlink($tarfile, $containerfile); return(0, "Decompressing $containerfile failed"); } - unlink($containerfile) if $remove_containerfile; if (untar($tarfile, $target, 1)) { return (1, "$pkg"); } else { @@ -2332,16 +2344,20 @@ =cut sub setup_programs { - my ($bindir, $platform) = @_; + my ($bindir, $platform, $tlfirst) = @_; my $ok = 1; + debug("setup_programs: preferring " . ($tlfirst ? "TL" : "system") . " versions\n"); + my $isWin = ($^O =~ /^MSWin/i); if ($isWin) { - setup_windows_one('tar', "$bindir/tar.exe", "--version", 1); + # we need to make sure that we use our own tar, since + # Windows system tar is stupid bsdtar ... + setup_one("w32", 'tar', "$bindir/tar.exe", "--version", 1); $platform = "exe"; } else { - # tar needs to be provided by the system! + # tar needs to be provided by the system, we not even check! $::progs{'tar'} = "tar"; if (!defined($platform) || ($platform eq "")) { @@ -2360,20 +2376,19 @@ # do not warn on errors push @working_downloaders, $dltype if setup_one(($isWin ? "w32" : "unix"), $defprog, - "$bindir/$dltype/$defprog.$platform", "--version", 1); + "$bindir/$dltype/$defprog.$platform", "--version", $tlfirst); } $::progs{'working_downloaders'} = [ @working_downloaders ]; my @working_compressors; - for my $comptype (@AcceptedCompressors) { - my $defprog = $CompressorProgram{$comptype}; + for my $defprog (sort {$Compressors{$a}{'priority'} <=> $Compressors{$b}{'priority'}} keys %Compressors) { # do not warn on errors if (setup_one(($isWin ? "w32" : "unix"), $defprog, - "$bindir/$comptype/$defprog.$platform", "--version", 1)) { - push @working_compressors, $comptype; + "$bindir/$defprog/$defprog.$platform", "--version", $tlfirst)) { + push @working_compressors, $defprog; # also set up $::{'compressor'} if not already done # this selects the first one, but we might reset this depending on # TEXLIVE_COMPRESSOR setting, see below - defined($::progs{'compressor'}) || ($::progs{'compressor'} = $comptype); + defined($::progs{'compressor'}) || ($::progs{'compressor'} = $defprog); } } $::progs{'working_compressors'} = [ @working_compressors ]; @@ -2411,7 +2426,7 @@ $::progs{'compressor'} = $ENV{'TEXLIVE_COMPRESSOR'}; } - if ($::opt_verbosity >= 2) { + if ($::opt_verbosity >= 1) { require Data::Dumper; use vars qw($Data::Dumper::Indent $Data::Dumper::Sortkeys $Data::Dumper::Purity); # -w pain @@ -2425,149 +2440,120 @@ } sub setup_one { - my ($what, $p, $def, $arg, $donotwarn) = @_; - if ($what eq "unix") { - return(setup_unix_one($p, $def, $arg, $donotwarn)); + my ($what, $p, $def, $arg, $tlfirst) = @_; + my $setupfunc = ($what eq "unix") ? \&setup_unix_tl_one : \&setup_windows_tl_one ; + if ($tlfirst) { + if (&$setupfunc($p, $def, $arg)) { + return(1); + } else { + return(setup_system_one($p, $arg)); + } } else { - return(setup_windows_one($p, $def, $arg, $donotwarn)); + if (setup_system_one($p, $arg)) { + return(1); + } else { + return(&$setupfunc($p, $def, $arg)); + } } } -sub setup_windows_one { - my ($p, $def, $arg, $donotwarn) = @_; +sub setup_system_one { + my ($p, $arg) = @_; + my $nulldev = nulldev(); + my $ret = system("$p $arg >$nulldev 2>&1"); + if ($ret == 0) { + debug("program $p found in the path\n"); + $::progs{$p} = $p; + return(1); + } else { + return(0); + } +} + +sub setup_windows_tl_one { + my ($p, $def, $arg) = @_; debug("(w32) trying to set up $p, default $def, arg $arg\n"); - my $ready = 0; + if (-r $def) { my $prog = conv_to_w32_path($def); my $ret = system("$prog $arg >nul 2>&1"); # on windows if ($ret == 0) { $::progs{$p} = $prog; - $ready = 1; + return(1); } else { tlwarn("Setting up $p with $def as $prog didn't work\n"); system("$prog $arg"); + return(0); } } else { debug("Default program $def not readable?\n"); + return(0); } - return($ready) if ($ready); - # still here, try plain name without any specification - debug("trying to test for plain prog name $p\n"); - $ret = system("$p $arg >nul 2>&1"); - if ($ret == 0) { - debug("program $p seems to be in the path!\n"); - $::progs{$p} = $p; - return(1); - } - return(0); } - # setup one prog on unix using the following logic: # - if the shipped one is -x and can be executed, use it # - if the shipped one is -x but cannot be executed, copy it. set -x # . if the copy is -x and executable, use it -# . if the copy is not executable, GOTO fallback # - if the shipped one is not -x, copy it, set -x # . if the copy is -x and executable, use it -# . if the copy is not executable, GOTO fallback -# - if nothing shipped, GOTO fallback -# -# fallback: -# if prog is found in PATH and can be executed, use it. -# -# Return 0 if failure, 1 if success. -# -sub setup_unix_one { - my ($p, $def, $arg, $donotwarn) = @_; +sub setup_unix_tl_one { + my ($p, $def, $arg) = @_; our $tmp; - my $test_fallback = 0; - ddebug("trying to set up $p, default $def, arg $arg\n"); + debug("(unix) trying to set up $p, default $def, arg $arg\n"); if (-r $def) { - my $ready = 0; if (-x $def) { ddebug("default $def has executable permissions\n"); # we have to check for actual "executability" since a "noexec" # mount option may interfere, which is not taken into account by -x. - $::progs{$p} = $def; - if ($arg ne "notest") { - my $ret = system("'$def' $arg >/dev/null 2>&1" ); # we are on Unix - if ($ret == 0) { - $ready = 1; - debug("Using shipped $def for $p (tested).\n"); - } else { - ddebug("Shipped $def has -x but cannot be executed, " - . "trying tmp copy.\n"); - } + my $ret = system("'$def' $arg >/dev/null 2>&1" ); # we are on Unix + if ($ret == 0) { + $::progs{$p} = $def; + debug("Using shipped $def for $p (tested).\n"); + return(1); } else { - # do not test, just return - $ready = 1; - debug("Using shipped $def for $p (not tested).\n"); + ddebug("Shipped $def has -x but cannot be executed, " + . "trying tmp copy.\n"); } } - if (!$ready) { - # out of some reasons we couldn't execute the shipped program - # try to copy it to a temp directory and make it executable - # - # create tmp dir only when necessary - $tmp = TeXLive::TLUtils::tl_tmpdir() unless defined($tmp); - # probably we are running from uncompressed media and want to copy it to - # some temporary location - copy($def, $tmp); - my $bn = basename($def); - $::progs{$p} = "$tmp/$bn"; - chmod(0755,$::progs{$p}); - # we do not check the return value of chmod, but check whether - # the -x bit is now set, the only thing that counts - if (! -x $::progs{$p}) { - # hmm, something is going really bad, not even the copy is - # executable. Fall back to normal path element - $test_fallback = 1; - ddebug("Copied $p $::progs{$p} does not have -x bit, strange!\n"); - } else { - # check again for executability - if ($arg ne "notest") { - my $ret = system("$::progs{$p} $arg > /dev/null 2>&1"); - if ($ret == 0) { - # ok, the copy works - debug("Using copied $::progs{$p} for $p (tested).\n"); - } else { - # even the copied prog is not executable, strange - $test_fallback = 1; - ddebug("Copied $p $::progs{$p} has x bit but not executable?!\n"); - } - } else { - debug("Using copied $::progs{$p} for $p (not tested).\n"); - } - } - } - } else { - # hope that we can find in the global PATH - $test_fallback = 1; - } - if ($test_fallback) { - # all our playing around and copying did not succeed, try PATH. - $::progs{$p} = $p; - if ($arg ne "notest") { - my $ret = system("$p $arg >/dev/null 2>&1"); + # we are still here + # out of some reasons we couldn't execute the shipped program + # try to copy it to a temp directory and make it executable + # + # create tmp dir only when necessary + $tmp = TeXLive::TLUtils::tl_tmpdir() unless defined($tmp); + # probably we are running from uncompressed media and want to copy it to + # some temporary location + copy($def, $tmp); + my $bn = basename($def); + my $tmpprog = "$tmp/$bn"; + chmod(0755,$tmpprog); + # we do not check the return value of chmod, but check whether + # the -x bit is now set, the only thing that counts + if (! -x $tmpprog) { + # hmm, something is going really bad, not even the copy is + # executable. Fall back to normal path element + ddebug("Copied $p $tmpprog does not have -x bit, strange!\n"); + return(0); + } else { + # check again for executability + my $ret = system("$tmpprog $arg > /dev/null 2>&1"); if ($ret == 0) { - debug("Using system $p (tested).\n"); + # ok, the copy works + debug("Using copied $tmpprog for $p (tested).\n"); + $::progs{$p} = $tmpprog; + return(1); } else { - if ($donotwarn) { - debug("$0: initialization of $p failed but ignored!\n"); - } else { - tlwarn("$0: Initialization failed (in setup_unix_one):\n"); - tlwarn("$0: could not find a usable $p.\n"); - tlwarn("$0: Please install $p and try again.\n"); - } - return 0; + # even the copied prog is not executable, strange + ddebug("Copied $p $tmpprog has x bit but not executable?!\n"); + return(0); } - } else { - debug ("Using system $p (not tested).\n"); } + } else { + # default program is not readable + return(0); } - return 1; } @@ -3897,7 +3883,8 @@ =item C<< download_to_temp_or_file($url) >> -If C<$url> tries to download the file into a temporary file. +If C<$url> is a url, tries to download the file into a temporary file. +Otherwise assume that C<$url> is a local file. In both cases returns the local file. Returns the local file name if succeeded, otherwise undef. diff -Nru texlive-lang-2018.20180725/tlpkg/texlive.tlpdb texlive-lang-2018.20180824/tlpkg/texlive.tlpdb --- texlive-lang-2018.20180725/tlpkg/texlive.tlpdb 2018-07-25 05:43:22.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/texlive.tlpdb 2018-08-24 02:18:19.000000000 +0000 @@ -26,11 +26,11 @@ depend frozen/0 depend minrelease/2016 depend release/2018 -depend revision/48268 +depend revision/48471 name 00texlive.image category TLCore -revision 48268 +revision 48471 shortdesc TeX Live files only in the source repository longdesc The files here are not copied by the installer and containers longdesc are not built for them; they exist only in the source @@ -40,7 +40,7 @@ longdesc this list. Those are not included in the source/ tarball. For longdesc information on the 00texlive prefix see longdesc 00texlive.installation(.tlpsrc) -runfiles size=4783 +runfiles size=4909 .mkisofsrc autorun.inf texmf-dist/README @@ -188,6 +188,7 @@ tlpkg/dev/profiles/TLctx.pro tlpkg/dev/profiles/TLfmt.pro tlpkg/dev/profiles/TLfull.pro + tlpkg/dev/profiles/TLinfra+exe.pro tlpkg/dev/profiles/TLinfra.pro tlpkg/dev/profiles/TLlink.pro tlpkg/dev/profiles/TLmed.pro @@ -277,6 +278,11 @@ tlpkg/doc/graphics/texlive-installer-graphics-vert.png tlpkg/doc/graphics/texlive-installer-graphics.pdf tlpkg/doc/graphics/texlive-installer-graphics.tex + tlpkg/doc/graphics/texlive-yearless.pdf + tlpkg/doc/graphics/texlive-yearless.svg + tlpkg/doc/graphics/texlive-yearless.tex + tlpkg/doc/graphics/tl-lion-black.eps + tlpkg/doc/graphics/tl-lion-black.pdf tlpkg/doc/historic/Perl-API.txt tlpkg/doc/historic/Shell-API.txt tlpkg/doc/historic/installer-layout.txt @@ -613,6 +619,7 @@ tlpkg/tlpsrc/beamertheme-epyt.tlpsrc tlpkg/tlpsrc/beamertheme-focus.tlpsrc tlpkg/tlpsrc/beamertheme-metropolis.tlpsrc + tlpkg/tlpsrc/beamertheme-npbt.tlpsrc tlpkg/tlpsrc/beamertheme-phnompenh.tlpsrc tlpkg/tlpsrc/beamertheme-saintpetersburg.tlpsrc tlpkg/tlpsrc/beamertheme-upenn-bc.tlpsrc @@ -779,6 +786,7 @@ tlpkg/tlpsrc/bullcntr.tlpsrc tlpkg/tlpsrc/bundledoc.tlpsrc tlpkg/tlpsrc/burmese.tlpsrc + tlpkg/tlpsrc/businesscard-qrcode.tlpsrc tlpkg/tlpsrc/bussproofs.tlpsrc tlpkg/tlpsrc/bxbase.tlpsrc tlpkg/tlpsrc/bxcalc.tlpsrc @@ -920,6 +928,7 @@ tlpkg/tlpsrc/clrdblpg.tlpsrc tlpkg/tlpsrc/clrscode.tlpsrc tlpkg/tlpsrc/clrscode3e.tlpsrc + tlpkg/tlpsrc/clrstrip.tlpsrc tlpkg/tlpsrc/cm-lgc.tlpsrc tlpkg/tlpsrc/cm-mf-extra-bold.tlpsrc tlpkg/tlpsrc/cm-super.tlpsrc @@ -1934,6 +1943,7 @@ tlpkg/tlpsrc/index.tlpsrc tlpkg/tlpsrc/indextools.tlpsrc tlpkg/tlpsrc/initials.tlpsrc + tlpkg/tlpsrc/inline-images.tlpsrc tlpkg/tlpsrc/inlinebib.tlpsrc tlpkg/tlpsrc/inlinedef.tlpsrc tlpkg/tlpsrc/inputtrc.tlpsrc @@ -2312,6 +2322,7 @@ tlpkg/tlpsrc/mathexam.tlpsrc tlpkg/tlpsrc/mathfam256.tlpsrc tlpkg/tlpsrc/mathfixs.tlpsrc + tlpkg/tlpsrc/mathfont.tlpsrc tlpkg/tlpsrc/mathpartir.tlpsrc tlpkg/tlpsrc/mathpazo.tlpsrc tlpkg/tlpsrc/mathpunctspace.tlpsrc @@ -2745,6 +2756,7 @@ tlpkg/tlpsrc/platex-tools.tlpsrc tlpkg/tlpsrc/platex.tlpsrc tlpkg/tlpsrc/platexcheat.tlpsrc + tlpkg/tlpsrc/plautopatch.tlpsrc tlpkg/tlpsrc/play.tlpsrc tlpkg/tlpsrc/playfair.tlpsrc tlpkg/tlpsrc/plex-otf.tlpsrc @@ -2993,6 +3005,7 @@ tlpkg/tlpsrc/resphilosophica.tlpsrc tlpkg/tlpsrc/resumecls.tlpsrc tlpkg/tlpsrc/resumemac.tlpsrc + tlpkg/tlpsrc/returntogrid.tlpsrc tlpkg/tlpsrc/reverxii.tlpsrc tlpkg/tlpsrc/revquantum.tlpsrc tlpkg/tlpsrc/revtex.tlpsrc @@ -3423,6 +3436,7 @@ tlpkg/tlpsrc/tikz-ladder.tlpsrc tlpkg/tlpsrc/tikz-layers.tlpsrc tlpkg/tlpsrc/tikz-nef.tlpsrc + tlpkg/tlpsrc/tikz-network.tlpsrc tlpkg/tlpsrc/tikz-opm.tlpsrc tlpkg/tlpsrc/tikz-optics.tlpsrc tlpkg/tlpsrc/tikz-page.tlpsrc @@ -3554,6 +3568,7 @@ tlpkg/tlpsrc/ucharcat.tlpsrc tlpkg/tlpsrc/ucharclasses.tlpsrc tlpkg/tlpsrc/ucs.tlpsrc + tlpkg/tlpsrc/ucsmonograph.tlpsrc tlpkg/tlpsrc/ucthesis.tlpsrc tlpkg/tlpsrc/udesoftec.tlpsrc tlpkg/tlpsrc/uebungsblatt.tlpsrc @@ -3682,6 +3697,7 @@ tlpkg/tlpsrc/wnri.tlpsrc tlpkg/tlpsrc/wordcount.tlpsrc tlpkg/tlpsrc/wordlike.tlpsrc + tlpkg/tlpsrc/worksheet.tlpsrc tlpkg/tlpsrc/wrapfig.tlpsrc tlpkg/tlpsrc/wsemclassic.tlpsrc tlpkg/tlpsrc/wsuipa.tlpsrc @@ -3837,7 +3853,7 @@ name 00texlive.installer category TLCore -revision 48248 +revision 48435 shortdesc TeX Live standalone installer package longdesc This package defines the files to go into the installer longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the @@ -3847,7 +3863,7 @@ longdesc *except* to build the installer archives, so it's ok. For longdesc information on the 00texlive prefix see longdesc 00texlive.installation(.tlpsrc) -runfiles size=101 +runfiles size=106 install-tl release-texlive.txt tlpkg/installer/COPYING.MinGW-runtime.txt @@ -7087,17 +7103,17 @@ name abnt category Package -revision 45655 +revision 48305 shortdesc Typesetting academic works according to ABNT rules relocated 1 longdesc The ABNT package provides a clean and practical implementation longdesc of the ABNT rules for academic texts. Its purpose is to be as longdesc simple and user-friendly as possible. -containersize 2508 -containerchecksum 860e30a0f880b23b73b8014e2a029c03fbf663a6dd2463b884bf100a8f78a6a56c4e061fd35b9be3717bb6f3a5dc81e851699df86cc3e058756bf135a7753413 -doccontainersize 93416 -doccontainerchecksum 58bfb4fe0cb7f8c25c583fda0f9e460c562010b6ddadbde57f1a919dcfe90d185ce4e223fc3554d53efc0254049a41e23edfced9efb4f80b5424fa04e7844733 -docfiles size=26 +containersize 2352 +containerchecksum 6b2007e2f6371717b54247348eee64eac17dcecc95e066d44e34ea61dfabcadbf0d4037585ce30b12b8977e2a40c0f3cefb45f7867330ff37a5f7d7676ba5d07 +doccontainersize 97712 +doccontainerchecksum 8067f473580e57fb9d4786bd29a4a6edc564f1154a59186b9eec9c6e7edd3183432075efaf7af45cded4c8a2393a4307e4a2756acb4e7950851bb562aa8d988c +docfiles size=27 RELOC/doc/latex/abnt/README.md details="Readme" RELOC/doc/latex/abnt/abnt-doc.pdf details="Package documentation" RELOC/doc/latex/abnt/abnt-doc.tex @@ -7105,7 +7121,7 @@ RELOC/tex/latex/abnt/abnt.sty catalogue-also biblatex-abnt abntex2 catalogue-ctan /macros/latex/contrib/abnt -catalogue-date 2017-10-31 16:28:44 +0100 +catalogue-date 2018-07-29 05:44:42 +0200 catalogue-license lppl1.3c catalogue-topics portuguese-br @@ -9578,7 +9594,7 @@ name alegreya category Package -revision 48170 +revision 48339 shortdesc Alegreya fonts with LaTeX support relocated 1 longdesc The Alegreya fonts are designed by Juan Pablo del Peral for @@ -9588,76 +9604,84 @@ longdesc much care and attention to detail in the design as the roman. longdesc Bold, black, small caps and five number styles are available. execute addMap Alegreya.map -containersize 14344988 -containerchecksum 4d3fb4b973aebb2aef4ea7800ad9f3fadc5c7efe49aad261f9bc49e70bd97501a24d57ff5f8e103d17dc8386b307c87299043b642e45d56bd0dc79948509f331 -doccontainersize 119272 -doccontainerchecksum cba8d9eb5eaf6b1914dddd2c5a64c2d8817c9a63b563446f34b54984e6678b8c66edf301bc14bedeed0ce95bd3ee890c8378d5a558443f34904ce58bc2a804c2 +containersize 14349940 +containerchecksum af63f3fa81e656be9014b066f90265ddc0ecdc985f5d171361bc447cacc264f72a9438146f06c30c270dc27cd4fff768dd4412d73bca34a4a15a3aa9879d2ef8 +doccontainersize 120108 +doccontainerchecksum a70ff6d31b328da403ce40d2fc71066e0c884843ec2572253b48710f1a76d3aca263d65619d91027e3fc41c1924561011e4814fe518ec396ef2692f2b9c40e25 docfiles size=33 RELOC/doc/fonts/alegreya/OFL.txt RELOC/doc/fonts/alegreya/README details="Readme" RELOC/doc/fonts/alegreya/alegreya-samples.pdf details="Font samples" RELOC/doc/fonts/alegreya/alegreya-samples.tex -runfiles size=12997 +runfiles size=12802 + RELOC/fonts/enc/dvips/alegreya/algr_226fyf.enc RELOC/fonts/enc/dvips/alegreya/algr_25hpeh.enc RELOC/fonts/enc/dvips/alegreya/algr_2irvk3.enc RELOC/fonts/enc/dvips/alegreya/algr_2vgxay.enc RELOC/fonts/enc/dvips/alegreya/algr_2zbc2r.enc - RELOC/fonts/enc/dvips/alegreya/algr_3hxbg5.enc + RELOC/fonts/enc/dvips/alegreya/algr_3j6zf7.enc RELOC/fonts/enc/dvips/alegreya/algr_3nh4kw.enc + RELOC/fonts/enc/dvips/alegreya/algr_4ns4wz.enc + RELOC/fonts/enc/dvips/alegreya/algr_4v37z4.enc + RELOC/fonts/enc/dvips/alegreya/algr_5gibri.enc RELOC/fonts/enc/dvips/alegreya/algr_5io2mf.enc - RELOC/fonts/enc/dvips/alegreya/algr_5prwcp.enc - RELOC/fonts/enc/dvips/alegreya/algr_6f5kk7.enc + RELOC/fonts/enc/dvips/alegreya/algr_5rsmqe.enc + RELOC/fonts/enc/dvips/alegreya/algr_66zd6s.enc RELOC/fonts/enc/dvips/alegreya/algr_6mopzx.enc - RELOC/fonts/enc/dvips/alegreya/algr_6ybopk.enc + RELOC/fonts/enc/dvips/alegreya/algr_6wvqta.enc RELOC/fonts/enc/dvips/alegreya/algr_7gwnxy.enc - RELOC/fonts/enc/dvips/alegreya/algr_a7ztal.enc - RELOC/fonts/enc/dvips/alegreya/algr_amldfj.enc + RELOC/fonts/enc/dvips/alegreya/algr_7jzpyg.enc RELOC/fonts/enc/dvips/alegreya/algr_b3sjml.enc RELOC/fonts/enc/dvips/alegreya/algr_b5w62b.enc - RELOC/fonts/enc/dvips/alegreya/algr_bbzsn7.enc RELOC/fonts/enc/dvips/alegreya/algr_bwwxle.enc - RELOC/fonts/enc/dvips/alegreya/algr_cc7vxe.enc - RELOC/fonts/enc/dvips/alegreya/algr_cdebql.enc - RELOC/fonts/enc/dvips/alegreya/algr_daw5go.enc - RELOC/fonts/enc/dvips/alegreya/algr_detotz.enc + RELOC/fonts/enc/dvips/alegreya/algr_chmses.enc + RELOC/fonts/enc/dvips/alegreya/algr_ck23qu.enc + RELOC/fonts/enc/dvips/alegreya/algr_dfcgiv.enc RELOC/fonts/enc/dvips/alegreya/algr_dfxw3v.enc - RELOC/fonts/enc/dvips/alegreya/algr_dhjtq2.enc - RELOC/fonts/enc/dvips/alegreya/algr_dzigrz.enc - RELOC/fonts/enc/dvips/alegreya/algr_e5aqsf.enc - RELOC/fonts/enc/dvips/alegreya/algr_f3xvsd.enc - RELOC/fonts/enc/dvips/alegreya/algr_f7bric.enc + RELOC/fonts/enc/dvips/alegreya/algr_dokm3m.enc + RELOC/fonts/enc/dvips/alegreya/algr_dte76s.enc + RELOC/fonts/enc/dvips/alegreya/algr_evb22y.enc RELOC/fonts/enc/dvips/alegreya/algr_f7lt35.enc - RELOC/fonts/enc/dvips/alegreya/algr_fz5itm.enc + RELOC/fonts/enc/dvips/alegreya/algr_fbntfe.enc + RELOC/fonts/enc/dvips/alegreya/algr_fi2sgn.enc + RELOC/fonts/enc/dvips/alegreya/algr_g3cfdt.enc RELOC/fonts/enc/dvips/alegreya/algr_gw2gjr.enc RELOC/fonts/enc/dvips/alegreya/algr_gygyyb.enc RELOC/fonts/enc/dvips/alegreya/algr_gyvvmk.enc + RELOC/fonts/enc/dvips/alegreya/algr_h4wxrq.enc RELOC/fonts/enc/dvips/alegreya/algr_hgnp5w.enc RELOC/fonts/enc/dvips/alegreya/algr_hsymcs.enc - RELOC/fonts/enc/dvips/alegreya/algr_i2uj5u.enc - RELOC/fonts/enc/dvips/alegreya/algr_iaccre.enc + RELOC/fonts/enc/dvips/alegreya/algr_hxyeky.enc + RELOC/fonts/enc/dvips/alegreya/algr_isiobp.enc RELOC/fonts/enc/dvips/alegreya/algr_iszm25.enc - RELOC/fonts/enc/dvips/alegreya/algr_iuoazx.enc - RELOC/fonts/enc/dvips/alegreya/algr_jx4b6u.enc + RELOC/fonts/enc/dvips/alegreya/algr_jfvu45.enc + RELOC/fonts/enc/dvips/alegreya/algr_jmly6e.enc + RELOC/fonts/enc/dvips/alegreya/algr_kvnvnq.enc + RELOC/fonts/enc/dvips/alegreya/algr_l3q2fl.enc RELOC/fonts/enc/dvips/alegreya/algr_lijdnj.enc + RELOC/fonts/enc/dvips/alegreya/algr_n26fs4.enc RELOC/fonts/enc/dvips/alegreya/algr_nrbejs.enc RELOC/fonts/enc/dvips/alegreya/algr_o47ngb.enc RELOC/fonts/enc/dvips/alegreya/algr_objcko.enc - RELOC/fonts/enc/dvips/alegreya/algr_onibjc.enc - RELOC/fonts/enc/dvips/alegreya/algr_qhgy5p.enc - RELOC/fonts/enc/dvips/alegreya/algr_qluftz.enc - RELOC/fonts/enc/dvips/alegreya/algr_qwzvud.enc - RELOC/fonts/enc/dvips/alegreya/algr_te6dnm.enc + RELOC/fonts/enc/dvips/alegreya/algr_oq6qvg.enc + RELOC/fonts/enc/dvips/alegreya/algr_orkgok.enc + RELOC/fonts/enc/dvips/alegreya/algr_p7kywn.enc + RELOC/fonts/enc/dvips/alegreya/algr_phmojf.enc + RELOC/fonts/enc/dvips/alegreya/algr_qizth5.enc + RELOC/fonts/enc/dvips/alegreya/algr_r57u46.enc + RELOC/fonts/enc/dvips/alegreya/algr_rpkba2.enc + RELOC/fonts/enc/dvips/alegreya/algr_su2s7h.enc + RELOC/fonts/enc/dvips/alegreya/algr_te6qwy.enc + RELOC/fonts/enc/dvips/alegreya/algr_tf5zvx.enc + RELOC/fonts/enc/dvips/alegreya/algr_u7nq5p.enc RELOC/fonts/enc/dvips/alegreya/algr_v3wuop.enc RELOC/fonts/enc/dvips/alegreya/algr_v7zz7p.enc - RELOC/fonts/enc/dvips/alegreya/algr_vggxw4.enc - RELOC/fonts/enc/dvips/alegreya/algr_wwxztk.enc - RELOC/fonts/enc/dvips/alegreya/algr_xkb3xy.enc - RELOC/fonts/enc/dvips/alegreya/algr_xr5off.enc + RELOC/fonts/enc/dvips/alegreya/algr_w4wd2e.enc + RELOC/fonts/enc/dvips/alegreya/algr_y2uq4q.enc RELOC/fonts/enc/dvips/alegreya/algr_ydutag.enc - RELOC/fonts/enc/dvips/alegreya/algr_yk3jhw.enc RELOC/fonts/enc/dvips/alegreya/algr_yncitp.enc + RELOC/fonts/enc/dvips/alegreya/algr_ywnyo5.enc RELOC/fonts/enc/dvips/alegreya/algr_zbisw7.enc - RELOC/fonts/enc/dvips/alegreya/algr_zcy6ab.enc RELOC/fonts/enc/dvips/alegreya/algr_zsorhr.enc RELOC/fonts/map/dvips/alegreya/Alegreya.map RELOC/fonts/opentype/huerta/alegreya/Alegreya-Black.otf @@ -12167,7 +12191,7 @@ RELOC/tex/latex/alegreya/TS1AlegreyaSans-TLF.fd RELOC/tex/latex/alegreya/TS1AlegreyaSans-TOsF.fd catalogue-ctan /fonts/alegreya -catalogue-date 2018-07-09 16:46:50 +0200 +catalogue-date 2018-08-03 05:14:09 +0200 catalogue-license ofllppl catalogue-topics font font-serif font-sans font-proportional font-t1enc font-type1 font-otf @@ -14791,7 +14815,7 @@ name animate category Package -revision 48101 +revision 48455 shortdesc Create PDF animations from graphics files and inline graphics relocated 1 longdesc The package provides an interface to create portable, @@ -14799,16 +14823,16 @@ longdesc from inline graphics, such as LaTeX picture environment, longdesc PSTricks or pgf/TikZ generated pictures, or just from typeset longdesc text. -containersize 19244 -containerchecksum 504c9596e09614eb0b7b1611bc35ac53e9b5079a1339ec20d2352365d762521f381af62cf3e42a8056cec761e32d9c19ea9920a410483622917a590cc36f73c8 -doccontainersize 3137892 -doccontainerchecksum 8b524de09563adb8c3efb4b5c80a19ddb8b82e94f7e29e891dc75f767ac073333a609a7ebfa760e88d58c459c839bc7ccf3d311ab837ae52b89d4e5c522b530a -docfiles size=933 +containersize 19548 +containerchecksum 6438d8c16a0807cb72cb025806236d293517c16472eb0dd2a03215d3fb3d06dd6f3c833833d9beb8c94cbf658943d3ef8f36bf83904a83f209959c432c117d86 +doccontainersize 3138632 +doccontainerchecksum 0019e09199861cd9180112ae2d5dc03c600f53341d9a86094a6f85975408bc80598a0f6907a41d2836721fb23cf6e4054ae3f7d46a0fd22b995662e888d0bd96 +docfiles size=934 RELOC/doc/latex/animate/ChangeLog RELOC/doc/latex/animate/README RELOC/doc/latex/animate/animate.pdf details="Package documentation" -srccontainersize 27584 -srccontainerchecksum 2487340ebc63c0e24d06ebb936a6326e24b392ad2696345fc69cdd555134f55e2d8d36c2da7f0e0fbd7bcca2b117e97c388732c26943d2bbd6151ea804dd06f1 +srccontainersize 27716 +srccontainerchecksum a8afc92f381cdd62727a3b60a498c92e980de4f57cee05e45ed70cee6ed58107e4fa26ca9a4ce7b1151eff1109b65b2f6c9d41d3b0566df68b4694606186bda7 srcfiles size=37 RELOC/source/latex/animate/animate.tex RELOC/source/latex/animate/files/bye_0.eps @@ -14819,10 +14843,10 @@ RELOC/source/latex/animate/files/exp.mp RELOC/source/latex/animate/files/pstmetronome.tex RELOC/source/latex/animate/files/scarab.mp -runfiles size=27 +runfiles size=28 RELOC/tex/latex/animate/animate.sty catalogue-ctan /macros/latex/contrib/animate -catalogue-date 2018-06-27 14:27:47 +0200 +catalogue-date 2018-08-22 13:29:23 +0200 catalogue-license lppl catalogue-topics graphics-motion @@ -16215,7 +16239,7 @@ name apxproof category Package -revision 47665 +revision 48377 shortdesc Proofs in appendix relocated 1 longdesc The package makes it easier to write articles where proofs and @@ -16229,28 +16253,28 @@ longdesc separate bibliography for the appendix material. It depends on longdesc the following other packages: amsthm, bibunits, environ, longdesc etoolbox, fancyvrb, ifthen, and kvoptions. -containersize 3452 -containerchecksum dbbc0ba2a386f87a518f99423e1edd24c6797ea6e6287d0f08c5e233375b06c6e19131d35686afb482f9a67f0d3155bf29cbf2408bb1b61ce3d281d067ddc47e -doccontainersize 455056 -doccontainerchecksum c7f5a43a3c1ec80b7ef0bc96d2a500584cac5ce98779df45cf4b29c9a18953892f723c5054462061ce25a1cd43244cce5d81cff0fbe6f09ac7d5cdc7161bbfee -docfiles size=118 +containersize 4004 +containerchecksum 33aefb9f9eb179501c5bb8680616706d8ee19722d6b99df045021d6ae9d20c925b190bf1871d47bed98c52fe43af9931391174807936e23f92d716e93c47d59f +doccontainersize 559912 +doccontainerchecksum 947994e1658490bbb080ecdf0dcf6d5df62d97a3a74420c72b5d871995bc39f397bc566f3136eec7df326b3885a1dce92c8945ac080b9d60422e96d638522ef4 +docfiles size=144 RELOC/doc/latex/apxproof/LICENSE RELOC/doc/latex/apxproof/Makefile RELOC/doc/latex/apxproof/README.md details="Readme" RELOC/doc/latex/apxproof/apxproof.bib RELOC/doc/latex/apxproof/apxproof.pdf details="Package documentation" -srccontainersize 12476 -srccontainerchecksum 1a0bfe3ac2481e7f157fe35a0306dc090b004a8ba4151880390ec6f7fbfcd71163da7ec98a9cc8c7dd836820f499ae646fe5cf6a462fcd250fee11ba5ca1b528 -srcfiles size=13 +srccontainersize 14628 +srccontainerchecksum 4c928cb17570451337f33109323d06f87b043ed9e3502a260f9164f17b0182741511606ec4078f3009fd6ffd757cec742098fe48322197ccc98e06d1e43bf926 +srcfiles size=15 RELOC/source/latex/apxproof/apxproof.dtx RELOC/source/latex/apxproof/apxproof.ins -runfiles size=3 +runfiles size=4 RELOC/tex/latex/apxproof/apxproof.sty catalogue-ctan /macros/latex/contrib/apxproof -catalogue-date 2018-05-10 14:22:30 +0200 +catalogue-date 2018-08-08 20:45:37 +0200 catalogue-license lppl1.3 catalogue-topics proof appendix -catalogue-version 1.0.6 +catalogue-version 1.1.0 name arabi category Package @@ -27385,7 +27409,7 @@ name beamer category Package -revision 46705 +revision 48468 shortdesc A LaTeX class for producing presentations and slides relocated 1 longdesc The beamer LaTeX class can be used for producing slides. The @@ -27406,12 +27430,13 @@ longdesc pgf, and translator. depend pgf depend xcolor -containersize 164748 -containerchecksum 4e31298242e3409d8667743794d3788769e57a4f393c8c8484998900b0769254e590bcc67b4cda8b572f13df1efb147705423926c5d7060948b2e436001a1ad5 -doccontainersize 2265276 -doccontainerchecksum c3e8a3d2922db4c1db91f157d69ad86cc2113d56e8984c646d7ab1a3fef035e7cbf0e0748bcafa916ce332297bb76d1fd5f3d4e320cea9ea8cb52a6837cf02cb -docfiles size=889 +containersize 164768 +containerchecksum b2fa718a3301d9cd12c1731ca6a2e2a60d3e7ae35cd660e57522d7bcd5b5b843e4bf62659e034a2c80806a672927fc6b42f190cf0ae57c2ac0d61b72d016cd4d +doccontainersize 2283932 +doccontainerchecksum c828ed81d0fdc902021c58cd26a54364f9d347c1fea5960f5926ae7c607095cdfd1d42cfa1ae7607eb303cae317e641a90df76838c26c5f2af9414045fa1d96c +docfiles size=912 RELOC/doc/latex/beamer/AUTHORS.md + RELOC/doc/latex/beamer/CHANGELOG.md RELOC/doc/latex/beamer/LICENSE.md RELOC/doc/latex/beamer/README.md details="Readme" RELOC/doc/latex/beamer/beamercolorthemeexample.tex @@ -27612,10 +27637,10 @@ RELOC/tex/latex/beamer/multimediasymbols.sty RELOC/tex/latex/beamer/xmpmulti.sty catalogue-ctan /macros/latex/contrib/beamer -catalogue-date 2018-02-20 22:50:14 +0100 +catalogue-date 2018-08-22 22:32:46 +0200 catalogue-license lppl1.3cgpl2+fdl catalogue-topics presentation class -catalogue-version 3.50 +catalogue-version 3.51 name beamer-FUBerlin category Package @@ -28092,17 +28117,17 @@ name beamertheme-focus category Package -revision 48211 +revision 48382 shortdesc A minimalist presentation theme for LaTeX Beamer relocated 1 longdesc A presentation theme for LaTeX Beamer that aims at a clean and longdesc minimalist design, so to minimize distractions and put the longdesc focus directly on the content. -containersize 4068 -containerchecksum 14a7bc43097af6fd6155f63b95f178b36e8e32b78836feaa6dd4e1e860a879f6a9dcf8e1517ec8ce441028a59c263e7417e9984885c1d223c96a92bb52d70bbe -doccontainersize 1161204 -doccontainerchecksum 580952a699fe36547c944c0099655888e944ead9b4ccdfac423e00c49d526467dda6c8669f9a2c032e67e6b295665ad0076dffb2c31cf1820b789929dad5eb56 -docfiles size=347 +containersize 4056 +containerchecksum 140f0c513ad9a69114d5c9af902ede05c980fa8bb0f7a4a4cb39f05544ca1406ce8e1216d8f9efe6e7d07d3e75b694353b6b53289664cba337d442e32ef55363 +doccontainersize 1164592 +doccontainerchecksum b323791db4eba03817fce3b04180d1321a42d44e6232a3d3783e3c2c0af9f8e86101ee35c6ea5d715f245319307292f1a011ed5d550d2e6cbfcc1a5b262f77dd +docfiles size=351 RELOC/doc/latex/beamertheme-focus/LICENSE RELOC/doc/latex/beamertheme-focus/README.md details="Readme" RELOC/doc/latex/beamertheme-focus/demo-screenshots/demo-appendix.jpg @@ -28123,10 +28148,10 @@ RELOC/tex/latex/beamertheme-focus/beamerouterthemefocus.sty RELOC/tex/latex/beamertheme-focus/beamerthemefocus.sty catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamertheme-focus -catalogue-date 2018-07-15 23:32:39 +0200 +catalogue-date 2018-08-09 15:34:44 +0200 catalogue-license gpl3 catalogue-topics presentation -catalogue-version 2.0 +catalogue-version 2.2 name beamertheme-metropolis category Package @@ -28172,6 +28197,56 @@ catalogue-topics presentation catalogue-version 1.2 +name beamertheme-npbt +category Package +revision 48424 +shortdesc A collection of LaTeX beamer themes +relocated 1 +longdesc "NPBT" stands for "Norman's Pandoc Beamer Themes". Currently +longdesc the following themes are supported: Sefiroth Consulting: A +longdesc private (demonstration) theme. FOM: The layout of Hochschule +longdesc FOM. FOM ifes: The layout of Hochschule FOM, Institut fur +longdesc Empirie & Statistik. eufom: The layout of eufom. +containersize 1457152 +containerchecksum a80e5acd243c701bc915a775c3c2934d4597222fdf10ddb6b7ce50cc97ce6d161e889445a28d77b89f7ed00f92ccd1cef42d752b28437c01e902fa5ed9235f4c +doccontainersize 418008 +doccontainerchecksum 41c730bdf265562c62edd3bd554629d62fc304faaa3147fda39bb242fa785d2c46ceac59421e431a51bbdf5d51a171aaffeb4b975c050c015646da202ad17d03 +docfiles size=113 + RELOC/doc/latex/beamertheme-npbt/LICENSE + RELOC/doc/latex/beamertheme-npbt/README details="Readme" + RELOC/doc/latex/beamertheme-npbt/example/NPBT_exsamle.pdf + RELOC/doc/latex/beamertheme-npbt/example/NPBT_exsamle.tex + RELOC/doc/latex/beamertheme-npbt/header.tex +runfiles size=404 + RELOC/tex/latex/beamertheme-npbt/beamercolorthemeNPBT_EUFOM.sty + RELOC/tex/latex/beamertheme-npbt/beamercolorthemeNPBT_FOM.sty + RELOC/tex/latex/beamertheme-npbt/beamercolorthemeNPBT_FOM_ifes.sty + RELOC/tex/latex/beamertheme-npbt/beamercolorthemeNPBT_SC.sty + RELOC/tex/latex/beamertheme-npbt/beamerouterthemeNPBT_FOM.sty + RELOC/tex/latex/beamertheme-npbt/beamerouterthemeNPBT_FOM_ifes.sty + RELOC/tex/latex/beamertheme-npbt/beamerthemeNPBT.sty + RELOC/tex/latex/beamertheme-npbt/images/LICENSE.md + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_background.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_frametitlebackground.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_ifes_backgound.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_ifes_frametitlebackgound.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_ifes_linie.pdf + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_ifes_logo.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_linie.pdf + RELOC/tex/latex/beamertheme-npbt/images/NPBT_FOM_logo.pdf + RELOC/tex/latex/beamertheme-npbt/images/NPBT_SC_background.jpg + RELOC/tex/latex/beamertheme-npbt/images/NPBT_SC_logo.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_eufom_backgound.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_eufom_frametitlebackgound.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_eufom_linie.png + RELOC/tex/latex/beamertheme-npbt/images/NPBT_eufom_logo.png + RELOC/tex/latex/beamertheme-npbt/images/lNPBT_SC_linie.png +catalogue-ctan /macros/latex/contrib/beamer-contrib/themes/beamertheme-npbt +catalogue-date 2018-08-17 14:24:37 +0200 +catalogue-license gpl3pd +catalogue-topics presentation +catalogue-version 4.1 + name beamertheme-phnompenh category Package revision 39100 @@ -29898,7 +29973,7 @@ name bib2gls category Package -revision 48158 +revision 48439 shortdesc Command line application to convert .bib files to glossaries-extra.sty resource files longdesc This Java command line application may be used to extract longdesc glossary information stored in a .bib file and convert it into @@ -29915,11 +29990,11 @@ longdesc containing definitions (\newglossaryentry etc.) to the .bib longdesc format required by bib2gls. depend bib2gls.ARCH -containersize 1060964 -containerchecksum f7358bc89733b693c9b6dcf00f260b0a3440d53ca241e7666c7e358fa9ed423fe76e751f68455c6bd7da96127086da4bd308fcb8622f7adfe8c922f368d5a350 -doccontainersize 3644896 -doccontainerchecksum c6ee66025ad4c8d926c4efb40de02e3dfbb62ea3017eb43e401f115e5789b3768f501001d35a6df5da2f1276322cf5306753d995fde7d4681bc4e3009cac51c9 -docfiles size=1365 +containersize 1063596 +containerchecksum fbb4fca76bfde79e9555746f40776a88dd5ef9e96ef48f0e9a698c772864d42f543c32d27293ad0fd099c6b5f457ceaab70fc7a15bfe2fbc3c9f718638efc778 +doccontainersize 3659280 +doccontainerchecksum 759637d2f3e928c14b52d7d66ee6621e3121ac0f00d1071d77af79f5ea227fc4608d506d1873b0db45ce045d27d2792a72372b97698846b2bd597e37bb1036ca +docfiles size=1368 texmf-dist/doc/support/bib2gls/CHANGES texmf-dist/doc/support/bib2gls/README.md details="Readme" texmf-dist/doc/support/bib2gls/bib2gls-begin.pdf details="Introductory Guide" @@ -29985,9 +30060,9 @@ texmf-dist/doc/support/bib2gls/examples/unaryoperators.bib texmf-dist/doc/support/bib2gls/examples/usergroups.bib texmf-dist/doc/support/bib2gls/examples/vegetables.bib -srccontainersize 1044888 -srccontainerchecksum 378774b29b078617b6038a3a8fc2d0e25bda49e193f25fa1e6c9a1912c9fbc65e6e04ab187c325ebf657bc817fd303fef50349b2b8543b9069eafef617460ee1 -srcfiles size=533 +srccontainersize 1039516 +srccontainerchecksum 570a62390c1ab9c38c26ef0b4dc8cd833386573ccb251625a04fb15f55147a475f072bed2fa1237694d601274dd946e08b8b262476cb2ce78b8361175081e3b0 +srcfiles size=534 texmf-dist/source/support/bib2gls/src/bib2gls-begin.tex texmf-dist/source/support/bib2gls/src/bib2gls-cite.bib texmf-dist/source/support/bib2gls/src/bib2gls-src.zip @@ -29997,7 +30072,7 @@ texmf-dist/source/support/bib2gls/src/convertgls2bib.pod texmf-dist/source/support/bib2gls/src/gls2bib-src.zip texmf-dist/source/support/bib2gls/src/texparser-src.zip -runfiles size=299 +runfiles size=300 texmf-dist/scripts/bib2gls/bib2gls.jar texmf-dist/scripts/bib2gls/bib2gls.sh texmf-dist/scripts/bib2gls/convertgls2bib.jar @@ -30005,10 +30080,10 @@ texmf-dist/scripts/bib2gls/resources/bib2gls-en.xml texmf-dist/scripts/bib2gls/texparserlib.jar catalogue-ctan /support/bib2gls -catalogue-date 2018-07-07 20:28:57 +0200 +catalogue-date 2018-08-19 06:09:27 +0200 catalogue-license gpl3+ catalogue-topics bibtex-util glossary -catalogue-version 1.6 +catalogue-version 1.7 name bib2gls.aarch64-linux category Package @@ -32011,7 +32086,7 @@ name biblatex-gb7714-2015 category Package -revision 48123 +revision 48406 shortdesc A BibLaTeX implementation of the GBT7714-2015 bibliography style for Chinese users relocated 1 longdesc This package provides an implementation of the GBT7714-2015 @@ -32019,11 +32094,11 @@ longdesc standard and can be used by simply loading BibLaTeX with the longdesc appropriate option. A demonstration database is provided to longdesc show how to format input for the style. -containersize 23876 -containerchecksum 690267480e06037bf5b550e717074d752b7633c9507fdde7ce8d97f353be33abd2c5010172e6d87ebb85f308fcd4b4ef0a6265a73f2d7e89305dfd85441dd898 -doccontainersize 1426420 -doccontainerchecksum b800d351d515ca9ef4ae9134bcaebccca787ee7afc7d8d0a0bed51084db5088c1f32aca8661480d8f7adc5feb511fd0fc3d0526a2d3177dda89f7bedc048105d -docfiles size=506 +containersize 23948 +containerchecksum 82327a95cbc8208a4f64302180dfbfa23af97dc2dea55c3a0d432a5bb778130f4f4d394bdf98148151fa3f000c42c077e1b44b78384ef76dc306d3e1d0d130f1 +doccontainersize 1454788 +doccontainerchecksum fc0ef294eddf11cae7aee706167be191b401cf6d7349e9342695fb14c48712191f250ee1561362651e8a826a090f9cb8e0ae53500778f6c4a1f712d69fb0a19c +docfiles size=514 RELOC/doc/latex/biblatex-gb7714-2015/README.md details="Readme" RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-content.tex RELOC/doc/latex/biblatex-gb7714-2015/biblatex-gb7714-2015-preamble.tex @@ -32070,6 +32145,8 @@ RELOC/doc/latex/biblatex-gb7714-2015/example/testjournal.tex RELOC/doc/latex/biblatex-gb7714-2015/example/testjournalay.tex RELOC/doc/latex/biblatex-gb7714-2015/example/testmultilan.tex + RELOC/doc/latex/biblatex-gb7714-2015/example/testmultilanay.bib + RELOC/doc/latex/biblatex-gb7714-2015/example/testmultilanay.pdf RELOC/doc/latex/biblatex-gb7714-2015/example/testmultilanay.tex RELOC/doc/latex/biblatex-gb7714-2015/example/testnamefmt.tex RELOC/doc/latex/biblatex-gb7714-2015/example/testonline.tex @@ -32093,23 +32170,23 @@ RELOC/doc/latex/biblatex-gb7714-2015/makeall.sh RELOC/doc/latex/biblatex-gb7714-2015/makeclear.sh RELOC/doc/latex/biblatex-gb7714-2015/makefile.sh -srccontainersize 804 -srccontainerchecksum 42f15f8664c488ce73659e5ca5a740c776ea27df3f61e5c304d6b5529127d23ce78020af364b447ba9e8ce9419b4f4279c33bf710971c1d51039231f4e5e2db3 +srccontainersize 820 +srccontainerchecksum b089c6ba3cf63a965c9c2d0208658ff65d9498bc2bcd30fc4b892b47ef2b6bc96b3f4bbcaa42456e8dec05305964e3b0e64394af141ae950fd9820018c7fd1bc srcfiles size=3 RELOC/source/latex/biblatex-gb7714-2015/makeall.bat RELOC/source/latex/biblatex-gb7714-2015/makeclear.bat RELOC/source/latex/biblatex-gb7714-2015/makefile.bat -runfiles size=56 +runfiles size=57 RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015-gbk.def RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015.bbx RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015.cbx RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.bbx RELOC/tex/latex/biblatex-gb7714-2015/gb7714-2015ay.cbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-gb7714-2015 -catalogue-date 2018-07-02 17:33:33 +0200 +catalogue-date 2018-08-15 18:06:46 +0200 catalogue-license lppl1.3 catalogue-topics biblatex chinese -catalogue-version 1.0l +catalogue-version 1.0m name biblatex-gost category Package @@ -32214,7 +32291,7 @@ name biblatex-ieee category Package -revision 43620 +revision 48448 shortdesc IEEE style files for BibLaTeX relocated 1 longdesc This is a BibLaTeX style that implements the bibliography style @@ -32225,10 +32302,10 @@ longdesc provided to show how to format input for the style. longdesc biblatex-ieee requires BibLaTeX 2.7 or later, and works with longdesc both BibTeX and Biber as the database back-end. -containersize 4908 -containerchecksum 0adaaf3cedbe476ade1a3d1087a3afcf35c9d0ef9f1b97219922872e66f5ad388941ae059155e66b46ad9f52b1175927fe7d2a0ab7ab28b2eb69a66d98debe12 -doccontainersize 575028 -doccontainerchecksum eb674bc07a5c2bf1904763ee359172b27527c4a24e76dcb86ab0a125aeaeb2b511b8d9a923ebb114272c0f9ff164db10a384d5d555b6f8df16c9d680f0c6c816 +containersize 5136 +containerchecksum 5712b4ca9dde2cb5c8353840db1d8bc860d611da8a7d8c72d1961081fb165fbd39363db8369f1b8d53c02e4a05770812b50598d4f78ee95a1ba6e15abafe4420 +doccontainersize 557372 +doccontainerchecksum d4ba471f45649bc7c9b10b8d478d7438f76edc97fc5396281eec9a4f7ec196baaea4f423a57a05d75bca16ff153fe9d82a53db9a1be84a804671f934b78ee8d9 docfiles size=175 RELOC/doc/latex/biblatex-ieee/LICENSE.md RELOC/doc/latex/biblatex-ieee/README.md details="Readme" @@ -32237,16 +32314,17 @@ RELOC/doc/latex/biblatex-ieee/biblatex-ieee.bib RELOC/doc/latex/biblatex-ieee/biblatex-ieee.pdf details="Package documentation" RELOC/doc/latex/biblatex-ieee/biblatex-ieee.tex -runfiles size=8 +runfiles size=9 RELOC/tex/latex/biblatex-ieee/ieee-alphabetic.bbx RELOC/tex/latex/biblatex-ieee/ieee-alphabetic.cbx RELOC/tex/latex/biblatex-ieee/ieee.bbx RELOC/tex/latex/biblatex-ieee/ieee.cbx + RELOC/tex/latex/biblatex-ieee/magyar-ieee.lbx catalogue-ctan /macros/latex/contrib/biblatex-contrib/biblatex-ieee -catalogue-date 2018-01-06 12:14:59 +0100 +catalogue-date 2018-08-21 09:59:57 +0200 catalogue-license lppl1.3 catalogue-topics biblatex journalpub -catalogue-version 1.2d +catalogue-version 1.3 name biblatex-ijsra category Package @@ -33193,16 +33271,16 @@ name bibleref category Package -revision 48241 +revision 48319 shortdesc Format bible citations relocated 1 longdesc The bibleref package offers consistent formatting of references longdesc to parts of the Christian bible, in a number of well-defined longdesc formats. It depends on ifthen, fmtcount, and amsgen. -containersize 6552 -containerchecksum 5f36beed124587e20aee0e31590061b0704f8e6758351a0b59836b4846e9f11ba27117f80c30663654917ea7c3a69fd4fc5ee7578a872f3bbbf7df49caedba3b -doccontainersize 339152 -doccontainerchecksum f7a9ec5be787b357a3950416f154c3031f600627ccf74e06cb8b52e80e364e58ff9121901aa6f0092b40754e786d29ffa67bf08fc69038454cf092dfe9018d82 +containersize 6640 +containerchecksum a41ef8b973bf34c97a5c3ee135a9194fed668c356e6a52b49c9dac8f1fa4b57292e0e0e44375fb2002e6e4b80579ed44d9820c5e0698b3b740dad3e14a3bd6bf +doccontainersize 342224 +doccontainerchecksum ab8ab83bc26304f710c804e207c367c0902d7592f2c109d491cd4dbb6bac72811a3e3f11dc1d4ef1c64352e601405958bdd02bb256223426b71ef3caa9a52e1a docfiles size=97 RELOC/doc/latex/bibleref/CHANGES RELOC/doc/latex/bibleref/README details="Readme" @@ -33217,19 +33295,19 @@ RELOC/doc/latex/bibleref/samples/sample-xidx.tex RELOC/doc/latex/bibleref/samples/sample.pdf RELOC/doc/latex/bibleref/samples/sample.tex -srccontainersize 16204 -srccontainerchecksum 674803a4d92ba8eda8939af49d263d6b0a91f43c59d927a8b6b7592328accae3a51e1856c76065c63168aaf28223cf1c5444bf7c9a65ec8be8200a6409372ed7 -srcfiles size=23 +srccontainersize 16416 +srccontainerchecksum 3db089895c7c566e29c3c710bc72f96d570c4eaed3fce0da339ca28672f28101a0719bf5a5afa94deca1728e884ea9e7236ef693d812d1cfe1e969e1fd611159 +srcfiles size=24 RELOC/source/latex/bibleref/bibleref.dtx RELOC/source/latex/bibleref/bibleref.ins runfiles size=10 RELOC/tex/latex/bibleref/bibleref-xidx.sty RELOC/tex/latex/bibleref/bibleref.sty catalogue-ctan /macros/latex/contrib/bibleref -catalogue-date 2018-07-21 19:34:39 +0200 +catalogue-date 2018-07-31 11:49:12 +0200 catalogue-license lppl1.3 catalogue-topics theology label-ref -catalogue-version 1.18 +catalogue-version 1.20 name bibleref-french category Package @@ -34202,16 +34280,16 @@ name bidi category Package -revision 48021 +revision 48397 shortdesc Bidirectional typesetting in plain TeX and LaTeX, using XeTeX relocated 1 longdesc A convenient interface for typesetting bidirectional texts with longdesc plain TeX and LaTeX. The package includes adaptations for use longdesc with many other commonly-used packages. -containersize 114792 -containerchecksum e72be2c4c14baf95c2b4a95dae4172c2eb484ba93814c3465ac0f066effa6fe2d5b0e8ae48f31cd33de9403cfb939ca7e78a00786b9aa041c85da09ac7985ee1 -doccontainersize 3685940 -doccontainerchecksum 031fc31ff0e981527e3a4c7ea60b3446fbff978769e202c177c70405cb2471b584529e0b8329a0859866fa9a78850781aaecae146e00dd224123c6f27ae83f1f +containersize 114956 +containerchecksum e7761fac234762df5acd4e3ded0fde78e8d919f6fe5a22868883c800b1614f0df68a3d4b62fde62fb5a8ad3406bfc482eb147b920d0cfb43fd4633ffecdd4d99 +doccontainersize 3685452 +doccontainerchecksum 78879ae760faec6b6f15416606cc4568b258249f9a350c6d6fd36633f8e0cf308f0d000f53c2ecc079cd27f28022617ebe56989596c3029d106a4496bef63d2c docfiles size=1012 RELOC/doc/xelatex/bidi/README details="Readme" RELOC/doc/xelatex/bidi/bidi-doc.pdf details="Package user documentation" @@ -34236,9 +34314,9 @@ RELOC/doc/xelatex/bidi/test2-colortbl.tex RELOC/doc/xelatex/bidi/test2-wrapfig.tex RELOC/doc/xelatex/bidi/test3-wrapfig.tex -srccontainersize 131680 -srccontainerchecksum 91ba3a140b2b83c1d578e0210f6bbebad4a34a5bf8745dea0cbb7e57e3f95281a08adf647f53660946851c210632b5c684eb3660be34477f42bc180a592f665a -srcfiles size=240 +srccontainersize 131876 +srccontainerchecksum dccead9fb2ca9c267e3d528f11138e56c2dd0823b1e9f5351c21919824780cfa38c236eb690806d588931d8b4c07777dfbb3bdc3fd928a994e1eb750dcfc028b +srcfiles size=241 RELOC/source/xelatex/bidi/bidi-doc-intro.ltx RELOC/source/xelatex/bidi/bidi-doc-latex-basics.ltx RELOC/source/xelatex/bidi/bidi-doc-latex-pkgs.ltx @@ -34382,10 +34460,10 @@ RELOC/tex/xelatex/bidi/xcolor-xetex-bidi.def RELOC/tex/xelatex/bidi/xltxtra-xetex-bidi.def catalogue-ctan /macros/xetex/latex/bidi -catalogue-date 2018-06-15 10:40:19 +0200 +catalogue-date 2018-08-12 09:08:13 +0200 catalogue-license lppl1.3c catalogue-topics typesetting xetex bidi class -catalogue-version 33.0 +catalogue-version 33.1 name bidi-atbegshi category Package @@ -37554,6 +37632,57 @@ catalogue-license lppl catalogue-topics burmese +name businesscard-qrcode +category Package +revision 48417 +shortdesc Business cards with QR-Code +relocated 1 +longdesc What happens when you give your visiting card to someone? +longdesc Either they manually type the text into their computer or +longdesc mobile phone, or it will end up in a box and be forgotten. +longdesc Nowadays data is required electronically, not on paper. Here is +longdesc the solution: A visiting card with QR-Code that contains a full +longdesc vcard so that it can be scanned with an app on the mobile phone +longdesc and thereby automatically imported into the electronic +longdesc contacts. This also works well when you are offline and +longdesc bluetooth transfer fails. So here is the highly configurable +longdesc business card or visiting card with full vcard as QR-Code, +longdesc ready to send to online printers. You can specify the exact +longdesc size of the paper and the content within the paper, inluding +longdesc generation of crop marks. The package depends on the following +longdesc other LaTeX packages: calc, crop, DejaVuSans, etoolbox, +longdesc fontawesome, fontenc, geometry, kvoptions, marvosym, qrcode, +longdesc varwidth, and wrapfig. The package needs XeLaTeX for working +longdesc properly. +containersize 3744 +containerchecksum b8515a3e81041e7c230e7b1781c475e4b1d1feab3e202ec280c423e3655c6ad587689772213adb3dfdca31473461f1e18e670b3cadaa4c0afe6c70527a9bf863 +doccontainersize 540992 +doccontainerchecksum 9b533194b712e522ea191a78027ef514a68dcbeecba67783c9515ba73842e8c1a3914f422538ebee97dac3c9201cd237a6ee2e6bed248e9a045267c1a72e5fd6 +docfiles size=158 + RELOC/doc/xelatex/businesscard-qrcode/README.md details="Readme" + RELOC/doc/xelatex/businesscard-qrcode/examples/example.pdf + RELOC/doc/xelatex/businesscard-qrcode/examples/example.tex + RELOC/doc/xelatex/businesscard-qrcode/examples/john-doe-hongkong.pdf + RELOC/doc/xelatex/businesscard-qrcode/examples/john-doe-hongkong.tex + RELOC/doc/xelatex/businesscard-qrcode/examples/peter-muster-example-company-zuerich.pdf + RELOC/doc/xelatex/businesscard-qrcode/examples/peter-muster-example-company-zuerich.tex + RELOC/doc/xelatex/businesscard-qrcode/examples/special-papersize.pdf + RELOC/doc/xelatex/businesscard-qrcode/examples/special-papersize.tex + RELOC/doc/xelatex/businesscard-qrcode/examples/texstudio_d30266.pdf + RELOC/doc/xelatex/businesscard-qrcode/examples/texstudio_d30266.tex + RELOC/doc/xelatex/businesscard-qrcode/screenshots/example.jpg + RELOC/doc/xelatex/businesscard-qrcode/screenshots/john-doe-hongkong.jpg + RELOC/doc/xelatex/businesscard-qrcode/screenshots/peter-muster-example-company-zuerich.jpg + RELOC/doc/xelatex/businesscard-qrcode/screenshots/special-papersize.jpg + RELOC/doc/xelatex/businesscard-qrcode/screenshots/texstudio_d30266.jpg +runfiles size=3 + RELOC/tex/xelatex/businesscard-qrcode/businesscard-qrcode.cls +catalogue-ctan /macros/xetex/latex/businesscard-qrcode +catalogue-date 2018-08-16 19:51:59 +0200 +catalogue-license lgpl +catalogue-topics class file-card qrcode xetex +catalogue-version 1.2 + name bussproofs category Package revision 27488 @@ -37844,7 +37973,7 @@ name bxjscls category Package -revision 48235 +revision 48466 shortdesc Japanese document class collection for all major engines relocated 1 longdesc This package provides an extended version of the Japanese @@ -37853,19 +37982,19 @@ longdesc version also supports pdfLaTeX, XeLaTeX and LuaLaTeX, with the longdesc aid of suitable packages that provide capability of Japanese longdesc typesetting. -containersize 30820 -containerchecksum 4cbb349bc1cb687298d4f8e20dbc7bee5422fad9a3d50841572241e9d488115d02f91e49feb93abae6e3bdbbb87d8e8d5bcd0bf093f0686c4656f9c5e237a6a6 -doccontainersize 1623164 -doccontainerchecksum 14f646d52c2144026906553d9f9bdbfdeff524f13c5e2f27d5ff0c16fd712257e9771a13651c8c94ac8b2291512d90768bc2c55a93ba7908bc0a4097ad549f99 -docfiles size=435 +containersize 30896 +containerchecksum bf6ac17a264cfccf13f80401a3b1bea26fe33ae12b0b33e939443ea53f12f0989c145ea2c90f855814664180d589bfb73e634da0eafaa5ad620c535da5cd6b90 +doccontainersize 1622816 +doccontainerchecksum 9b1055ae2330e3d7ef89200c4dd504180f7db5d55187049bfaf59fac22825525252308f441421d09ab8214eea4b5344c7af8856b09d869fd0e068b3c81e49e92 +docfiles size=436 RELOC/doc/latex/bxjscls/LICENSE RELOC/doc/latex/bxjscls/README-ja.md details="Readme (Japanese)" language="ja" RELOC/doc/latex/bxjscls/README.md details="Readme" RELOC/doc/latex/bxjscls/bxjscls-manual.pdf details="User guide (Japanese)" language="ja" RELOC/doc/latex/bxjscls/bxjscls-manual.tex RELOC/doc/latex/bxjscls/bxjscls.pdf details="Package documentation (Japanese)" language="ja" -srccontainersize 77280 -srccontainerchecksum 5e1999f9bb48e77a3058bbfe495e9ff39cda95eaa45becc996a8bd1d82da3d615bb5b215fcd045418520d7edeea1e6b4714364efdd4cc77be09cd3fe652cdd01 +srccontainersize 77356 +srccontainerchecksum a2c1339564ec0a234794732d1e7d7da530903f93205de41d1b741a30d1fa024014d9266c823ea6586cf0092140c50d2cbc797af28500a3a2b0f607e610b71913 srcfiles size=93 RELOC/source/latex/bxjscls/bxjscls.dtx RELOC/source/latex/bxjscls/bxjscls.ins @@ -37882,10 +38011,10 @@ RELOC/tex/latex/bxjscls/bxjsreport.cls RELOC/tex/latex/bxjscls/bxjsslide.cls catalogue-ctan /language/japanese/BX/bxjscls -catalogue-date 2018-07-20 08:44:52 +0200 +catalogue-date 2018-08-23 04:26:44 +0200 catalogue-license bsd2 catalogue-topics japanese class -catalogue-version 1.9a +catalogue-version 1.9b name bxnewfont category Package @@ -45861,7 +45990,7 @@ name chemfig category Package -revision 47329 +revision 48467 shortdesc Draw molecules with easy syntax relocated 1 longdesc The package provides the command \chemfig{}, which draws @@ -45871,10 +46000,10 @@ longdesc many of the conventional notations for illustrating the longdesc 3-dimensional layout of a molecule. The package uses TikZ for longdesc its actual drawing operations. -containersize 22476 -containerchecksum 312cbbf752508b12b64d67c0fa124d3825ac6265ba64743764fdf1e4858373a272db94d1b0c52018d16429c4fa4383e5f77a6c4b761bc71a526b96f045f84a44 -doccontainersize 1992204 -doccontainerchecksum 6cef18dbb001e19301d162d3006ef07fd8689b824aed6cb73e1561df2807ecabd0906568af0ef23f511b63bf4f62789920790fe473a547d8b386fe3fac86c92a +containersize 22544 +containerchecksum b90471170eb25263aaccad0747ece05d50a2de5dc71be55da19766ebdf0a48e849852ccc96dc97349592e0f0e012264eca2292d5e2a25a90a624be38986f6248 +doccontainersize 1994016 +doccontainerchecksum fadbd54df60a693ed18209d924013171d1567731c702d6fd0e7103eb5332c3d23d9a737a65b59a86756a7bfc97709dc464daf1b81ead8a2cb032e3cec8c3ec3b docfiles size=615 RELOC/doc/generic/chemfig/README details="Readme" RELOC/doc/generic/chemfig/chemfig-en.pdf details="Package documentation (English)" language="en" @@ -45886,10 +46015,10 @@ RELOC/tex/generic/chemfig/chemfig.tex RELOC/tex/generic/chemfig/t-chemfig.tex catalogue-ctan /macros/generic/chemfig -catalogue-date 2018-04-06 08:14:17 +0200 +catalogue-date 2018-08-23 10:28:43 +0200 catalogue-license lppl1.3c catalogue-topics diagram chemistry pgf-tikz -catalogue-version 1.31 +catalogue-version 1.32 name chemformula category Package @@ -49300,6 +49429,32 @@ catalogue-license lppl catalogue-topics pseudocode +name clrstrip +category Package +revision 48313 +shortdesc Place contents into a full width colour strip +relocated 1 +longdesc This lightweight package provides the colorstrip environment, +longdesc that places its contents into a full page width colour strip. +containersize 1512 +containerchecksum 9d85f504bf1f7ab9b801e41f82957e65b76f79452595ea043bd11a9cdaec90502caf630694c83bf900489e4361440458cea31743e0fa4f6ed92b1184ff2a324c +doccontainersize 374044 +doccontainerchecksum 7343cc6710da3127ae4a32e0d7cc2b4ce255f890196b0434b670afb4d7a847faa4506f83f7e071085da281ab57ef083eb975fb14544cc3d0d9e813e2dd28e86a +docfiles size=93 + RELOC/doc/latex/clrstrip/README.md details="Readme" + RELOC/doc/latex/clrstrip/clrstrip.pdf details="Package documentation" +srccontainersize 3808 +srccontainerchecksum 47a8dec3e683350fca158373fa3eb44878ea0c27737d34795c960db2b744d6da922840d7d6db4fce8757c163b94fac2e39c1549346e2a3a51c7c8a7285a1f670 +srcfiles size=4 + RELOC/source/latex/clrstrip/clrstrip.dtx +runfiles size=1 + RELOC/tex/latex/clrstrip/clrstrip.sty +catalogue-also tcolorbox +catalogue-ctan /macros/latex/contrib/clrstrip +catalogue-date 2018-07-30 14:29:45 +0200 +catalogue-license lppl1.3c +catalogue-topics colour + name cm category Package revision 45811 @@ -56726,7 +56881,7 @@ name collection-langjapanese category Collection -revision 47703 +revision 48447 shortdesc Japanese relocated 1 longdesc Support for Japanese; additional packages in @@ -56758,10 +56913,11 @@ depend platex depend platex-tools depend platexcheat +depend plautopatch depend ptex depend ptex-base -depend ptex-fonts depend ptex-fontmaps +depend ptex-fonts depend ptex2pdf depend pxbase depend pxchfon @@ -56777,7 +56933,7 @@ depend zxjafbfont depend zxjatype containersize 556 -containerchecksum dfd6c4b425b60e4dfac1e34af7d7dc058fdc5cd127603224008e7d8f96c8d6875ca1d389e10e7942447e24aca6b087e6988ea5323c33c461637b09a38e23b575 +containerchecksum 42ad699c2fd1b24931eb9a387eafee12773536a8dd7ad762f8f8ef0f3df8ab55739caa92d914e94aa0e390a84e7421842b987556ae85f9a90add8438f06a7bb5 name collection-langkorean category Collection @@ -56976,7 +57132,7 @@ name collection-latexextra category Collection -revision 48268 +revision 48459 shortdesc LaTeX additional packages relocated 1 longdesc A very large collection of add-on packages for LaTeX. @@ -57050,6 +57206,7 @@ depend beamertheme-epyt depend beamertheme-focus depend beamertheme-metropolis +depend beamertheme-npbt depend beamertheme-phnompenh depend beamertheme-saintpetersburg depend beamertheme-upenn-bc @@ -57142,6 +57299,7 @@ depend clock depend cloze depend clrdblpg +depend clrstrip depend cmdstring depend cmdtrack depend cmsd @@ -57533,6 +57691,7 @@ depend import depend incgraph depend indextools +depend inline-images depend inlinedef depend inputtrc depend interactiveworkbook @@ -57650,6 +57809,7 @@ depend mathastext depend mathexam depend mathfam256 +depend mathfont depend maybemath depend mbenotes depend mcaption @@ -57894,6 +58054,7 @@ depend relsize depend repeatindex depend repltext +depend returntogrid depend rjlparshap depend rlepsf depend rmpage @@ -58143,6 +58304,7 @@ depend withargs depend wordcount depend wordlike +depend worksheet depend wrapfig depend wtref depend xargs @@ -58185,8 +58347,8 @@ depend ziffer depend zwgetfdate depend zwpagelayout -containersize 5608 -containerchecksum db2ea00a4da863cc43377d3d0fbd30ab72888b46464fce17e84a207d0ea0d08c7595dd6bc910e6ef981fd23b8ebb90a4192baa02c907d66ed5e1feb7412dd62f +containersize 5636 +containerchecksum e94f0365e2d8db95be256f982b29b87fd74b9aee0d9a60cccdc5bf2532485bef0cabb6eed97b9e337892899c59a7983df58044dc8125ccd558e07d654de9d089 name collection-latexrecommended category Collection @@ -58585,7 +58747,7 @@ name collection-pictures category Collection -revision 48240 +revision 48314 shortdesc Graphics, pictures, diagrams relocated 1 longdesc Including TikZ, pict, etc., but MetaPost and PStricks are @@ -58731,6 +58893,7 @@ depend tikz-ladder depend tikz-layers depend tikz-nef +depend tikz-network depend tikz-opm depend tikz-optics depend tikz-page @@ -58769,8 +58932,8 @@ depend visualpstricks depend xpicture depend xypic -containersize 1260 -containerchecksum 18e91e04fe0c81e51e062692d1807bccc24d86aa2ab418d6f34b4025754f82494d540d372fca14db9f8411f93820d61d57a45833b4c2b9208c3e243cf66617ac +containersize 1264 +containerchecksum 4738ac8e18d2fb8609a0a95ad6615b0d0eaf761a81510c6af032283ac66dcd4ba1ce803811d2fc899f8fa7726f077a0bf6fd64c33f464ed2b8e49fc5080bf113 name collection-plaingeneric category Collection @@ -58992,7 +59155,7 @@ name collection-publishers category Collection -revision 48186 +revision 48453 shortdesc Publisher styles, theses, etc. relocated 1 depend collection-latex @@ -59131,8 +59294,8 @@ depend ryethesis depend sageep depend sapthesis -depend scrjrnl depend schule +depend scrjrnl depend scientific-thesis-cover depend sduthesis depend seuthesis @@ -59166,6 +59329,7 @@ depend uantwerpendocs depend ucbthesis depend ucdavisthesis +depend ucsmonograph depend ucthesis depend uestcthesis depend uhhassignment @@ -59193,8 +59357,8 @@ depend xcookybooky depend yathesis depend york-thesis -containersize 1288 -containerchecksum 7d3d2f2a44c689d43895796a3b260c0dfad6cf32621f051ff32496f7d3492cfb59292271bb8740d1c2bdffbe6dedbecb71c98ff4e07b591675d49c8255e9fc38 +containersize 1292 +containerchecksum 742e304016e4b0ecdd9f27e118d85602b6ce2fe9f961dac57217bf7e3cb8ac2c4d3be2c46db3eef3881e396147e0c1e0597debd0be9f25dc72041eee866ea350 name collection-texworks category Collection @@ -59221,7 +59385,7 @@ name collection-xetex category Collection -revision 47630 +revision 48417 shortdesc XeTeX and packages relocated 1 longdesc Packages for XeTeX, the Unicode/OpenType-enabled TeX by @@ -59234,6 +59398,7 @@ depend bidipagegrid depend bidishadowtext depend bidipresentation +depend businesscard-qrcode depend cqubeamer depend fixlatvian depend font-change-xetex @@ -59266,8 +59431,8 @@ depend xetexfontinfo depend xetexko depend xevlna -containersize 616 -containerchecksum 317b8b69eab9a5c7db812aab880f9367ebf17234bc3cb7e4d781ad295abd8fbd2b83cb6cac9128b0996cdb6f560c10b26208ae648c906a4b95db007d84ff42da +containersize 624 +containerchecksum 9535aea2dca0d6ac8f8b30433842056ce4fa5fe94abaef177f4505156d316ef999bfaa12ea5d8e7c826f58878cdc6d80e2244c35589904ffe59459d87b48447f name collref category Package @@ -65169,7 +65334,7 @@ name context-filter category ConTeXt -revision 47530 +revision 48390 shortdesc Run external programs on the contents of a start-stop environment relocated 1 longdesc The filter module provides a simple interface to run external @@ -65180,10 +65345,10 @@ longdesc temporary files that are created. The module is compatible with longdesc both MkII and MkIV. depend context -containersize 6456 -containerchecksum 7c3f944c9c5ad05d5f496c8b47ab72b49b73c48c3a7e1981ef68f0b1962148122d030416093cd92b3dbf036431d0989b68c0270933e3d7639cd942ce62149bb7 -doccontainersize 10292 -doccontainerchecksum cc2cc0a3a48f20bb61d6ecafb39f2bd86993298f0b6ffb0389faa1adf705dde8c57d2f6c6e82301b4f80f82f4abcaaf02ade2ce05a7a6c9cda6a8650fd68632f +containersize 6480 +containerchecksum 3e9f249dcda534a42eeaecbd4d83aae63dd598c117ad83713b3c2728b2f2184cffc33af264b70ef7e2993a9f8827132d60600bbc277cb271d4ef02631eadf586 +doccontainersize 10308 +doccontainerchecksum 7ef047381612b397507e9b12c96f242570ec974c4e48ed18f61ba68070edda02f1ff99e110d8d16ced58bc6476cb88adbb8b3c37e6ac2fd4b07fdf5a55aba9b1 docfiles size=9 RELOC/doc/context/third/filter/VERSION RELOC/doc/context/third/filter/filter.txt details="Package notes" @@ -65193,7 +65358,7 @@ RELOC/tex/context/third/filter/t-module-catcodes.mkii RELOC/tex/context/third/filter/t-module-catcodes.mkiv catalogue-ctan /macros/context/contrib/context-filter -catalogue-date 2017-04-26 20:41:30 +0200 +catalogue-date 2018-08-11 06:19:01 +0200 catalogue-license bsd2 catalogue-topics ext-code @@ -65929,7 +66094,7 @@ name context-vim category ConTeXt -revision 47531 +revision 48391 shortdesc Generate ConTeXt syntax highlighting code from vim relocated 1 longdesc ConTeXt has excellent pretty printing capabilities for many @@ -65943,10 +66108,10 @@ longdesc 2context.vim script to do the syntax parsing in ViM. depend context-filter depend context -containersize 8072 -containerchecksum 44d6734580286e47126e3227e47f70770123f6d058961f1eb0851f20dc1fada3c9af46844997960a655a0e1d9ea1c06e72da7dd3341adaa1792218903bf9001f -doccontainersize 6664 -doccontainerchecksum 46911513789ba56acd404590345cb40833b06894966ff68e57d7f89799ecda02bcc8f9d12a7c41fecfb0a9c0d780ade270ac490ff947fc3422cf3a07c464c22f +containersize 8088 +containerchecksum 630cf92427d777d48b52be13a8418e1be0d6cefb21303f3af4b9dac3ae976d59a1aebb312e010b63149ee23865e991baccc4cc5f5fcd552b0c7fe966f51aa7b7 +doccontainersize 6676 +doccontainerchecksum 982201a594aa45f1fe80c80479391bdd2775f83846824d30de0a27d608abe8c5840607c8ecf214b55c8df41378a2c174a45d2d11083712a9c53153538874affd docfiles size=6 RELOC/doc/context/third/vim/VERSION RELOC/doc/context/third/vim/vim.txt details="Package usage notes" @@ -65958,7 +66123,7 @@ RELOC/tex/context/third/vim/t-vim.tex catalogue-also context-filter catalogue-ctan /macros/context/contrib/context-vim -catalogue-date 2018-01-07 22:06:04 +0100 +catalogue-date 2018-08-11 06:19:01 +0200 catalogue-license bsd catalogue-topics synt-hlt ext-code context @@ -73708,22 +73873,22 @@ name datetime2-polish category Package -revision 36692 +revision 48456 shortdesc Polish language module for the datetime2 package relocated 1 longdesc This module provides the "polish" style that can be set using longdesc \DTMsetstyle provided by datetime2.sty. This package is longdesc currently unmaintained. Please see the README for the procedure longdesc to follow if you want to take over the maintenance. -containersize 2604 -containerchecksum 28ead55835e9255b2a44aee6f87466647456ee34ae74942f8ea3cbba1ab604b844ba2f9ec220db387ca871cd368e1cefac70934139dcf1da8dfc1526b58724f9 -doccontainersize 83292 -doccontainerchecksum 45f9694d4c1a2f1f92239fe26acf4aa11091d84a1f2e25df8464aa810f551f45c2a8926f6706a09bbc6026683ed9f44a9b652d192baf4d2ea140d41bb935c0d9 +containersize 2596 +containerchecksum 279b0cdb1800a13ab31ced923948e1075d0699dd8645faecabfcac7974ce4cfa8cd74b23a9569dd2f00aaca818cdc9bbcc844b17877d89ae8e6b509e172d3848 +doccontainersize 83764 +doccontainerchecksum 512206ee7a44a1cfaeda700a8c5e98560c057c51ec92a8566f66e81ebf6a70503b9d57fb633f867c73e580c65c6f4204fa68a1f16ddfcba3f2bdb28bed4d1ad3 docfiles size=22 RELOC/doc/latex/datetime2-polish/README details="Readme" RELOC/doc/latex/datetime2-polish/datetime2-polish.pdf details="Package documentation" -srccontainersize 4848 -srccontainerchecksum 1717f1435e4d1e8ff70fc3d034395dc97a7e6d0f36244e34162438257542544d8c40ec8c6f29830c2972927025d5f462e41d6b812e63581f0912471900198fde +srccontainersize 4868 +srccontainerchecksum 7af7b4e1a746f552c8eb125a6bb7ae55babf44b880c783bda3cc6984711c781309c3047bf1d8f03bc914a2d51e35c5882aa5394bac59de64bc3f01d7950dded3 srcfiles size=6 RELOC/source/latex/datetime2-polish/datetime2-polish.dtx RELOC/source/latex/datetime2-polish/datetime2-polish.ins @@ -73732,30 +73897,30 @@ RELOC/tex/latex/datetime2-polish/datetime2-polish-utf8.ldf RELOC/tex/latex/datetime2-polish/datetime2-polish.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-polish -catalogue-date 2018-01-07 12:01:59 +0100 +catalogue-date 2018-08-21 21:59:42 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual -catalogue-version 1.0 +catalogue-version 1.1 name datetime2-portuges category Package -revision 36670 +revision 48457 shortdesc Portuguese language module for the datetime2 package relocated 1 longdesc This module provides the "portuges" style that can be set using longdesc \DTMsetstyle provided by datetime2.sty. This package is longdesc currently unmaintained. Please see the README for the procedure longdesc to follow if you want to take over the maintenance. -containersize 2528 -containerchecksum 6c1fdc3050a399185b8cddfbe7fe421e211c9710470ca89717117509dd0cc4a150e83382d0dabed372c19e8e554347aa07f95839df37bd2324ebb24d486bb8ab -doccontainersize 286940 -doccontainerchecksum 717f37fbe3101a3508932dc2fe5f7a952ad94252b3fc5a77857527dba16ed8ba2c7989bc61782872fdc5440a65d1d1c63718e1a66d63ee747e797bb05adaa236 +containersize 2512 +containerchecksum 249da207d08d396662ce8ab61b7f565a75bc3c6b4a375d0eccfa8f9c17ebc6b8dfb7d5ade7f28974584c6b1b3f0432f3b847a5e6435badd225d6efad0bfa49cd +doccontainersize 286568 +doccontainerchecksum 993e4ba069df709610af771cffd0c88292f982ef27369264afc0c8b10057235b3bbf3d720aca6199f2757f0c154af3fcc3b686f2eb7e191a760ff6221f90bd1f docfiles size=71 RELOC/doc/latex/datetime2-portuges/README details="Readme" RELOC/doc/latex/datetime2-portuges/datetime2-portuges.pdf details="Package documentation" -srccontainersize 4740 -srccontainerchecksum b6cc8a33c3e76a7cb50055b282d8c4602fd111153956e23816e4190243315e8737dcb66fa9e92f06ae2e5376341ac68a5135b44ead2672a89ce5dc7bc7949469 -srcfiles size=5 +srccontainersize 4772 +srccontainerchecksum de00206d85c9c4ec0198b1b3df2e69563b07f6bcb2f49936897cca05bb5ab3bf6efe7978b920266e9dfd6509617890bf9213b4431c8f9bd290d5cadb1d00ab51 +srcfiles size=6 RELOC/source/latex/datetime2-portuges/datetime2-portuges.dtx RELOC/source/latex/datetime2-portuges/datetime2-portuges.ins runfiles size=4 @@ -73763,10 +73928,10 @@ RELOC/tex/latex/datetime2-portuges/datetime2-portuges-utf8.ldf RELOC/tex/latex/datetime2-portuges/datetime2-portuges.ldf catalogue-ctan /macros/latex/contrib/datetime2-contrib/datetime2-portuges -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-21 21:51:52 +0200 catalogue-license lppl1.3 catalogue-topics date-time multilingual -catalogue-version 1.0 +catalogue-version 1.1 name datetime2-romanian category Package @@ -81177,7 +81342,7 @@ name ducksay category Package -revision 45647 +revision 48375 shortdesc Draw ASCII art of animals saying a specified message relocated 1 longdesc The package draws ASCII art of animals saying a specified @@ -81186,12 +81351,12 @@ longdesc messages are supported but need to be manually created using longdesc \\. containersize 4364 -containerchecksum 2a4ca824db9e9adccf3a7f1776f75d53c4601e4367128b7e361ff3589396fc60a34db512e091d0ac2cce519dda2f1735da199582a519061352ba15165b90e06a -doccontainersize 3664 -doccontainerchecksum 5caed12fa10f93321eb5f908800c9e7fbd5452d3cb4d3dbef50c6a0360a86299bbcfadaee7c7b30bcaffc0a27a8288413ccd429517ffc05a7df07a033ebc89e2 -docfiles size=4 - RELOC/doc/latex/ducksay/README.TEXLIVE +containerchecksum 9ddfba14ab34458bd65a653d1203b18052dbd1100899711b27d52ef6b7d0e1bbf9f73f7f80d9ad90249b5c30a56910f5c3e48ed2b8eb1b58bced62acf9e2aa25 +doccontainersize 230812 +doccontainerchecksum 97c0331bd5e2ce9697b3cd85ee49f57a80034cad064673d23254de10db5fddae439eee09c95c841588c9a6c105eb87ba309e84aeb2757fc9bc3429e47ec8bebc +docfiles size=59 RELOC/doc/latex/ducksay/README.md details="Readme" + RELOC/doc/latex/ducksay/ducksay.pdf details="Package documentation" RELOC/doc/latex/ducksay/ducksay.tex runfiles size=4 RELOC/tex/latex/ducksay/ducksay.sty @@ -83997,11 +84162,11 @@ name dvisvgm.win32 category TLCore -revision 47099 +revision 48311 shortdesc win32 files of dvisvgm -containersize 1405240 -containerchecksum 6fb6be3fb87a7c69d079bd1d1ba444d78bf24a0b8900f8ed36661ffece571bfb1d2b534b6cb62584d28f0452df869b2067a76d3acf7a490adf23152b6a810a8d -binfiles arch=win32 size=1643 +containersize 1404320 +containerchecksum ffd3741ed0531bed04942e6114e2227be3c554eda565d7dcff2137acb764f2ae80261535418762b5f185c3fbf7484f9bdb7c35bfb255e0982cc568b1bfb8e7a2 +binfiles arch=win32 size=1648 bin/win32/dvisvgm.exe name dvisvgm.x86_64-cygwin @@ -95433,7 +95598,7 @@ name etoolbox category Package -revision 46602 +revision 48436 shortdesc e-TeX tools for LaTeX relocated 1 longdesc The package is a toolbox of programming facilities geared @@ -95446,10 +95611,10 @@ longdesc alternative ways of implementing some LaTeX kernel commands; longdesc nevertheless, the package will not modify any part of the LaTeX longdesc kernel. -containersize 8312 -containerchecksum cb38aa19635c1370089583e5c44e896325d18d9ecffb64b5ebdf6d6c1ee2ea5fff9914d4aca26a3a8f07e5c9cd4e5314f24faea9a55d9053992f04e7335edccd -doccontainersize 234812 -doccontainerchecksum e283c501d72374a34b9014ff2338ef6a2f3154d0b13e1d1393c752c8424cc82418bad8469789d37f3622c3e88b72f6a23020b155a5e3734fd30e87ad4b06d4d0 +containersize 8304 +containerchecksum 10df1906c7fc0617ca28164da6002c47852316684b15f0cb871082b6556c8d8f1710e9378b8f361e00a77eb9444a37dd5805a5c3003da8e7e55303f4714d81b9 +doccontainersize 234980 +doccontainerchecksum b180fe1229785c301dbfe0a9c58534482f55190d895595c21561694e7a26145cadb54bdd61e82536acb1369e31b1f0c143615a3cece41b32a295d760563f2f87 docfiles size=75 RELOC/doc/latex/etoolbox/README.md details="Readme" RELOC/doc/latex/etoolbox/etoolbox.pdf details="Package documentation" @@ -95458,10 +95623,10 @@ RELOC/tex/latex/etoolbox/etoolbox.def RELOC/tex/latex/etoolbox/etoolbox.sty catalogue-ctan /macros/latex/contrib/etoolbox -catalogue-date 2018-02-11 10:01:09 +0100 +catalogue-date 2018-08-19 12:54:37 +0200 catalogue-license lppl1.3c catalogue-topics macro-supp etex -catalogue-version 2.5e +catalogue-version 2.5f name etoolbox-de category Package @@ -97062,7 +97227,7 @@ name factura category Package -revision 47816 +revision 48333 shortdesc Typeset and calculate invoices according to Venezuelan law relocated 1 longdesc 'factura' is the Spanish word for 'invoice', so this is a LaTeX @@ -97072,11 +97237,11 @@ longdesc use is not restricted to Venezuela because all variables and longdesc the displayed text can be redefined by invoking commands or longdesc editing. -containersize 25292 -containerchecksum c9cc7c055314386be58d1720de0da1d8eec4dd52c9dd12410ad4a63dcaaa4386c00f984e285b25d0b8b3dffec00b7dbfd7ba8154d2c037fda1d4b7d93e3cbd4f -doccontainersize 710724 -doccontainerchecksum c73deb72ffb9c5fcb2f7e88dccf569efcf042fc87da328bdc98dc5e9946c998f1a67e5358fba7c80cbd07d0150530b966d105fa3d8567b8e87074ffae8458a40 -docfiles size=275 +containersize 25344 +containerchecksum f9ac35ff37b156b76f940f31ee68642ae28b276afd424c324d4b386cf6fbbf4f0115cbdcf03667c5e9a186a3b7cb9d4693fb4d8c1a90ea53f81f2a5ad80f9f49 +doccontainersize 710636 +doccontainerchecksum 0ae6bee674dce3b651b9abbd124fd7d45196d24b9371291f7bae6cbb745099596abd02d58b4cc7341d8155c64faea1288113fd97a97550865d864c5ccb63f5d9 +docfiles size=276 RELOC/doc/latex/factura/README details="Readme" RELOC/doc/latex/factura/factura-beispiel-rechnung.tex RELOC/doc/latex/factura/factura-ejemplo-aux.tex @@ -97100,19 +97265,19 @@ RELOC/doc/latex/factura/factura-ejemplo-reporte2.tex RELOC/doc/latex/factura/factura-ejemplo-reporte3.tex RELOC/doc/latex/factura/factura.pdf details="Package documentation" language="es-ve" -srccontainersize 66208 -srccontainerchecksum bd41f373670015350ae0c522a711d8e560e7380a1baeab40f0cf7cb8ffa50301cf1c9ea8179d82a63c8e762e7889e6751ad885ea021a1497520022485a0df9ef -srcfiles size=76 +srccontainersize 67080 +srccontainerchecksum f5ddc8449fd8fd8cc3c5fe050e1ceda817ad64ed836365821b69c71705a4b87e312e414eb94b07e31beba0b6e08a2ed64d4c1923303ae037893dca3f05f3e214 +srcfiles size=77 RELOC/source/latex/factura/factura.dtx RELOC/source/latex/factura/factura.ins runfiles size=30 RELOC/tex/latex/factura/factura.cls RELOC/tex/latex/factura/factura.def catalogue-ctan /macros/latex/contrib/factura -catalogue-date 2018-05-22 22:34:17 +0200 +catalogue-date 2018-08-02 20:31:16 +0200 catalogue-license lppl1.3 catalogue-topics invoice spanish class -catalogue-version 3.56 +catalogue-version 3.57 name facture category Package @@ -101668,7 +101833,7 @@ name fira category Package -revision 47835 +revision 48465 shortdesc Fira fonts with LaTeX support relocated 1 longdesc This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX @@ -101677,10 +101842,10 @@ longdesc Sans is available in eleven weights with corresponding italics: longdesc light, regular, medium, bold, ... execute addMap fira.map -containersize 13476296 -containerchecksum 2bb959d69948df2d60c7edf728f2880bbe530f8f483e45af0ebeeac3cd6cd213435d4ad8d2518184f9f6de77956bdcc61e9a5be8f266b0e80cfa6dbb789b1bc8 -doccontainersize 829336 -doccontainerchecksum c4de03733d12586b2acc1c5c9308bc0287513c4f02447b94f77c7308aa4aa44e8c71434a93e5d4b149153632be9cea410fcdb112b65c570661f89134beb758d7 +containersize 13476260 +containerchecksum f09f81ae6c451d89c2d00e7e7a98bd619ddb6b33b05c111a40911261977e2123c33aef2b479201c291b437714b4cd0dca4a4c8605e777e0bb617a7edba95f0b1 +doccontainersize 829328 +doccontainerchecksum aed5ad3d6c8d83c648e389e1e0965c8f5c61f8906a0a7874b2c347e88b006126522d10084d5b3279c89951ad208cc90cf1f3473568c779b6227a31b83dbad23b docfiles size=211 RELOC/doc/fonts/fira/Fira_4_2_Version_Log.pdf RELOC/doc/fonts/fira/LICENSE @@ -103726,7 +103891,7 @@ RELOC/tex/latex/fira/TS1FiraSans-TLF.fd RELOC/tex/latex/fira/TS1FiraSans-TOsF.fd catalogue-ctan /fonts/fira -catalogue-date 2018-05-25 19:21:57 +0200 +catalogue-date 2018-08-22 21:17:51 +0200 catalogue-license ofllppl catalogue-topics font font-sans font-mono font-otf font-type1 font-proportional font-t1enc catalogue-version 4.2 @@ -105471,7 +105636,7 @@ name fontawesome5 category Package -revision 48143 +revision 48292 shortdesc Font Awesome 5 with with LaTeX support relocated 1 longdesc This package provides LaTeX support for the included "Font @@ -105480,15 +105645,15 @@ longdesc commercial "Pro" version is also supported, if it is installed longdesc and XeLaTeX or LuaLaTeX is used. execute addMap fontawesome5.map -containersize 793400 -containerchecksum a877a8e44cfd58f8e31e47f9690e2e44cd3168b99456ebc6af151843f9a88b91deb62a3f5d7dc02f45289c7bf854349293214a069d64b5f009c63756b3c857b5 -doccontainersize 149256 -doccontainerchecksum e73b93519aaa918bcd323cd6741b5680d64194747df0dd85977090680be99119f5f236c77d01c20837beab680c31ab385b4416bb8df451a67d90d4415502a005 +containersize 813768 +containerchecksum a9173c52b32143df20ea051d5ed08e9dd1bc1aa3c7e585d45f5673f457aee535dd84de6e484cf1ce81149fb101ae16b4e03a80bd30a262b7ac0601b720c78618 +doccontainersize 149508 +doccontainerchecksum a441b09f17ea27fa9e8595445eb5f348568112b8f43f378349cb97b0ffaf84fccf6a98217becc0d1ccdf9830b431f1ced45fd6030e5436bae7bc0b53b7b3f3f8 docfiles size=38 RELOC/doc/fonts/fontawesome5/README.md details="Readme" RELOC/doc/fonts/fontawesome5/fontawesome5.pdf details="Package documentation" RELOC/doc/fonts/fontawesome5/fontawesome5.tex -runfiles size=307 +runfiles size=313 RELOC/fonts/enc/dvips/fontawesome5/fa5brands0.enc RELOC/fonts/enc/dvips/fontawesome5/fa5brands1.enc RELOC/fonts/enc/dvips/fontawesome5/fa5free0.enc @@ -105524,10 +105689,10 @@ RELOC/tex/latex/fontawesome5/ufontawesomefree2.fd catalogue-also fontawesome catalogue-ctan /fonts/fontawesome5 -catalogue-date 2018-06-21 14:38:29 +0200 +catalogue-date 2018-07-27 23:40:52 +0200 catalogue-license ofllppl1.3c catalogue-topics font font-supp-symbol font-symbol font-otf font-type1 -catalogue-version 5.1.0 +catalogue-version 5.2.0.1 name fontaxes category Package @@ -106112,7 +106277,7 @@ name fontools category Package -revision 47134 +revision 48387 shortdesc Tools to simplify using fonts (especially TT/OTF ones) longdesc This package provides a few tools to ease using fonts longdesc (especially TrueType/OpenType ones) with LaTeX and fontinst: @@ -106122,10 +106287,10 @@ longdesc plus .fd and .sty files; and ot2kpx - extract all kerning pairs longdesc from an OpenType font. depend fontools.ARCH -containersize 33720 -containerchecksum 96e4568e6d4899ee7239e26a776fb25ef2b7b2e1c16771e928a8f94acbc6e352a6e04a402378bf800a503999d38e854275e1b12ef87fb3b8c9c37d660dac0c79 -doccontainersize 112412 -doccontainerchecksum 5e17803db5ec6585fbb172ee090ee52bc80e08632de3062c1843c0abacafa1d48e7967a6b864c1f79434fbfad4e1370b5582aada85cbaf7409d9bd5ae2ac8fb5 +containersize 34668 +containerchecksum 8eedde1531eb4dfd2d0012a7317c26957d57b6d57cccefae52b0e0abd0e8af70eecb0f1aea52885460326b03755da779e8b0253db264dcaa3626632d73abaf44 +doccontainersize 115208 +doccontainerchecksum 23a9b7db94ab948275f35f4694ac7eafff56943f7d19655f75bcacee48137ebf1d6635e1030d7de46f29e3c4f4f09065dec96a27ed535172b749dffafd2d94c0 docfiles size=48 texmf-dist/doc/man/man1/afm2afm.1 texmf-dist/doc/man/man1/afm2afm.man1.pdf @@ -106135,16 +106300,20 @@ texmf-dist/doc/man/man1/ot2kpx.man1.pdf texmf-dist/doc/support/fontools/GPLv2.txt texmf-dist/doc/support/fontools/README details="Bundle readme" -runfiles size=37 +runfiles size=41 + texmf-dist/fonts/enc/dvips/fontools/fontools_lgr.enc texmf-dist/fonts/enc/dvips/fontools/fontools_ly1.enc texmf-dist/fonts/enc/dvips/fontools/fontools_ot1.enc texmf-dist/fonts/enc/dvips/fontools/fontools_t1.enc + texmf-dist/fonts/enc/dvips/fontools/fontools_t2a.enc + texmf-dist/fonts/enc/dvips/fontools/fontools_t2b.enc + texmf-dist/fonts/enc/dvips/fontools/fontools_t2c.enc texmf-dist/fonts/enc/dvips/fontools/fontools_ts1.enc texmf-dist/scripts/fontools/afm2afm texmf-dist/scripts/fontools/autoinst texmf-dist/scripts/fontools/ot2kpx catalogue-ctan /fonts/utilities/fontools -catalogue-date 2018-03-26 20:37:47 +0200 +catalogue-date 2018-08-10 13:46:14 +0200 catalogue-license gpl2 catalogue-topics font-devel @@ -106827,7 +106996,7 @@ name fontspec category Package -revision 45732 +revision 48320 shortdesc Advanced font selection in XeLaTeX and LuaLaTeX relocated 1 longdesc Fontspec is a package for XeLaTeX and LuaLaTeX. It provides an @@ -106841,19 +107010,20 @@ depend xunicode depend lm depend euenc -containersize 25832 -containerchecksum 9bf4dbd67a58dff924dada31e07b6292708268be14fd9a8163521f57006f9fae70eb4cf91b2ede2daca95ab1e088d3c47f8d1770b74efbd9a66d9e5a7ebc59b1 -doccontainersize 1240640 -doccontainerchecksum 889c1778061a67d5d981ceeb89ad1ac545afd04f66065acd09df34b8ac971e05ce1fbcaf7cd191042b0bcc143e5aeb4ae1e276e0e1196718fe816e0129f8e71e -docfiles size=324 +containersize 25952 +containerchecksum 05bb93b4ec4e247ef7db42aca8d2ab73d3be47e7cab38aba7239772ac5e9719dbc376c4158447bdadf9bad2fbc47b9988a949d9a4323ca646c00287d0642b3ae +doccontainersize 1266880 +doccontainerchecksum 3338c7d7c75bf93f56d2315383682fe7c6facd33fb16d68e3f8852e7699081b71b954fa43a810ab01db8d7c6cfa64b9744cdcc3ecc5e1f61b5f3ac9c73573e36 +docfiles size=334 RELOC/doc/latex/fontspec/CHANGES.md + RELOC/doc/latex/fontspec/LICENSE RELOC/doc/latex/fontspec/README.md details="Package README" RELOC/doc/latex/fontspec/fontspec-code.pdf RELOC/doc/latex/fontspec/fontspec-example.tex RELOC/doc/latex/fontspec/fontspec.pdf details="Package documentation" -srccontainersize 81392 -srccontainerchecksum 6a995ba6ddffad2440102d46c0ec3415ba08233b83c18012dd8170b9838264ec006071b3586b908ca9b75187ef95bdcd196db56da66477546453ccfeff646c3c -srcfiles size=112 +srccontainersize 82128 +srccontainerchecksum 268df8e8436603d0ee15fb85ec6ed5f42d5b4164c88a83a205bac88d874abdd74b3c9e219a2441b06dfe023b67cd4ef760ac847cc941608d3787b1c35b590304 +srcfiles size=113 RELOC/source/latex/fontspec/fontspec-api.dtx RELOC/source/latex/fontspec/fontspec-closing.dtx RELOC/source/latex/fontspec/fontspec-code-load.dtx @@ -106890,17 +107060,17 @@ RELOC/source/latex/fontspec/fontspec.dtx RELOC/source/latex/fontspec/fontspec.ins RELOC/source/latex/fontspec/fontspec.ltx -runfiles size=75 +runfiles size=76 RELOC/tex/latex/fontspec/fontspec-luatex.sty RELOC/tex/latex/fontspec/fontspec-xetex.sty RELOC/tex/latex/fontspec/fontspec.cfg RELOC/tex/latex/fontspec/fontspec.lua RELOC/tex/latex/fontspec/fontspec.sty catalogue-ctan /macros/latex/contrib/fontspec -catalogue-date 2017-11-09 13:17:35 +0100 +catalogue-date 2018-07-29 17:23:32 +0200 catalogue-license lppl1.3c catalogue-topics font-sel luatex xetex -catalogue-version 2.6g +catalogue-version 2.6h name fonttable category Package @@ -109563,7 +109733,7 @@ name gbt7714 category Package -revision 47792 +revision 48352 shortdesc BibTeX implementation of China's bibliography style standard GB/T 7714-2015 relocated 1 longdesc The package provides a BibTeX implementation for the Chinese @@ -109573,27 +109743,29 @@ longdesc in the standard. It also support automatic language longdesc recognization (Chinese and English) for each biblilography longdesc entry and is designed to be fully compatible with natbib. -containersize 7760 -containerchecksum 4262b19f15b62e0bf8d44a7b059afd776a24fe56d8251fcc78382c56b3ba1b48d7a02df3f0112e407ac9436364b757a6dffb2eea01cba4d75e20314081516212 -doccontainersize 134560 -doccontainerchecksum 67d8d2d2cfbcc606735adab837e4950cd2b18d8aaf5ed2f849c891ddc1aaf3438ea61ec95c2e995514544705d6eb91e47a23eb0135106670a50299469471c12b -docfiles size=39 +containersize 8344 +containerchecksum 09109545412bf81801f5bf3ff2a11c499c46bf38042602a7c16026ce34f6d223c53aec6983c9aaf1bd3f98f020f728d82d1a51f883a0ac77b5ae3c489b899262 +doccontainersize 320456 +doccontainerchecksum 663114268e2f5459d2bc6d28752d01483a88bfd1d7abd6d98dd115d421a25fab7acddd5892e51343906cb71ef153376e6ea6c60b9cf6e65ee7958dff4a2ac64e +docfiles size=84 RELOC/doc/bibtex/gbt7714/LICENSE RELOC/doc/bibtex/gbt7714/README.md details="Readme" language="zh" RELOC/doc/bibtex/gbt7714/gbt7714.pdf details="Package documentation" language="zh" -srccontainersize 19812 -srccontainerchecksum 17f12f2d7eb36a86b5e346b4446048ef83ade19b3e4ebe43505361e1048f2e4a40a5b8129b6a95137899078b91b05e34010244ace11b39507df1dec57d28119c -srcfiles size=20 +srccontainersize 23568 +srccontainerchecksum 10e7e84891458b374f7fe70b9b6021cce8b0bc9a1aaf57a673dccb014bdd4567300cf80716f1a11ef8ab35a5944c909f7a7781145d6668a4f79415fb6c95631c +srcfiles size=24 RELOC/source/bibtex/gbt7714/gbt7714.dtx -runfiles size=18 +runfiles size=35 + RELOC/bibtex/bst/gbt7714/gbt7714-2005-plain.bst + RELOC/bibtex/bst/gbt7714/gbt7714-2005-unsrt.bst RELOC/bibtex/bst/gbt7714/gbt7714-plain.bst RELOC/bibtex/bst/gbt7714/gbt7714-unsrt.bst RELOC/tex/latex/gbt7714/gbt7714.sty catalogue-ctan /biblio/bibtex/contrib/gbt7714 -catalogue-date 2018-05-22 12:57:46 +0200 +catalogue-date 2018-08-05 15:01:13 +0200 catalogue-license lppl1.3c catalogue-topics bibtex-supp chinese -catalogue-version 1.0.7 +catalogue-version 1.0.9 name gcard category Package @@ -110141,7 +110313,7 @@ name gentombow category Package -revision 47738 +revision 48449 shortdesc Generate Japanese-style crop marks relocated 1 longdesc This bundle provides a LaTeX package for generating @@ -110154,10 +110326,10 @@ longdesc compatibility only. bounddvi.sty: Set papersize special to DVI longdesc file. Can be used on LaTeX/pLaTeX/upLaTeX (with DVI output longdesc mode) with dvips or dvipdfmx drivers. -containersize 7436 -containerchecksum 66d50bc51eab3d3960b07b50743ac378afaa30eb4c6802777a45055d05e3336007089544d19d50b84a7a3d01b78690fc94b7ca7f4ca29900365478cbd2d574f6 -doccontainersize 542556 -doccontainerchecksum 0f9bf6d08f66c8e09654ed74bada2deff42be186171ce281963e0446ce4c1a1a302ba043411a6ad92ca1e968bb510b0d0b0f60d3131da36b9c9d88f5d7499416 +containersize 7584 +containerchecksum c5899e5870bf4fe5d5200dfd72ea01d6cd2317c66290e9f80f1a05b7d0d79afc2b2ce50eda4f742ff8a43a4e5ede2133c85931e2c1f2d9ab4c33a1c2759666ae +doccontainersize 542248 +doccontainerchecksum 86473a4c92e75a0c77e5abdd002f0be110d5609246917e89846128caa2936a0d5919f83c157c87009e410edab2f344673ebb9a1a3dd15b3fbc664906d5d00cee docfiles size=148 RELOC/doc/latex/gentombow/LICENSE RELOC/doc/latex/gentombow/Makefile @@ -110177,7 +110349,7 @@ RELOC/tex/latex/gentombow/gentombow.sty RELOC/tex/latex/gentombow/pxgentombow.sty catalogue-ctan /macros/latex/contrib/gentombow -catalogue-date 2018-05-17 19:06:28 +0200 +catalogue-date 2018-08-21 18:32:36 +0200 catalogue-license bsd3 catalogue-topics japanese layout-page page-control @@ -112694,7 +112866,7 @@ name glossaries-extra category Package -revision 47827 +revision 48437 shortdesc An extension to the glossaries package relocated 1 longdesc This package provides improvements and extra features to the @@ -112703,11 +112875,11 @@ longdesc manual glossaries-extra-manual.pdf for further details. longdesc glossaries-extra.sty requires the glossaries package and, longdesc naturally, all packages required by glossaries.sty. -containersize 55276 -containerchecksum 9a63e41a8476dbf6f3b066a5fd336562b17c95f781f95306b3a4d4b7211e82b2f5a4033321df2019f2d4a5430b211070b269f03e61213255662e615955d4d455 -doccontainersize 4901712 -doccontainerchecksum ed96577172053b6148b0d611dad27dce8a4e1891032875af94c6cfbd24c3755e3b6b87adaf3a9a8b88e4eb9bb0c31ce30974b8a1c6064f7ed3de674c986af228 -docfiles size=1777 +containersize 55504 +containerchecksum dfdb272461d5c80ab102e53a4526e5e2d456852f312afcc7ac4b0b09ab24dde698527f6c89de085c878342a1a39dbfdbc44a47858efeb08f5b20442c2fcc739e +doccontainersize 4872476 +doccontainerchecksum b9156ba7f4d6eb53d5ebff9e822dd019f3b7c7222ecbe696792da689c0bdc8bdc12694d2e14056815a27a9276b9daae24949119970604f4d474b0924c08b3ac5 +docfiles size=1778 RELOC/doc/latex/glossaries-extra/CHANGES RELOC/doc/latex/glossaries-extra/README details="Readme" RELOC/doc/latex/glossaries-extra/glossaries-extra-code.pdf @@ -112809,12 +112981,12 @@ RELOC/doc/latex/glossaries-extra/sample-unitentrycount.tex RELOC/doc/latex/glossaries-extra/sample.pdf RELOC/doc/latex/glossaries-extra/sample.tex -srccontainersize 98124 -srccontainerchecksum d8cfebf67577ddf5efbfaf3a973672ce1d395f030758689d981a17bfc8437b19c5e3c905a946f25921403d69bc025d98fab0c2fe1e3bf0e8514eb0ac85330ee5 -srcfiles size=220 +srccontainersize 98924 +srccontainerchecksum 7c67a891d43b50f5afffc5c19038dc7472915ea4d52800c611b64bab9a20f09a13064493d9f9fb494b1fafb207843c4cac10ae90808839a1c86efb84760e2167 +srcfiles size=221 RELOC/source/latex/glossaries-extra/glossaries-extra.dtx RELOC/source/latex/glossaries-extra/glossaries-extra.ins -runfiles size=138 +runfiles size=139 RELOC/bibtex/bib/glossaries-extra/example-glossaries-acronym-desc.bib RELOC/bibtex/bib/glossaries-extra/example-glossaries-acronym.bib RELOC/bibtex/bib/glossaries-extra/example-glossaries-acronyms-lang.bib @@ -112835,10 +113007,10 @@ RELOC/tex/latex/glossaries-extra/glossary-bookindex.sty catalogue-also glossaries catalogue-ctan /macros/latex/contrib/glossaries-extra -catalogue-date 2018-05-24 18:16:58 +0200 +catalogue-date 2018-08-18 23:08:07 +0200 catalogue-license lppl1.3 catalogue-topics glossary acronym -catalogue-version 1.32 +catalogue-version 1.36 name glossaries-finnish category Package @@ -119644,7 +119816,7 @@ name hyph-utf8 category Package -revision 47422 +revision 48290 shortdesc Hyphenation patterns expressed in UTF-8 relocated 1 longdesc Modern native UTF-8 engines such as XeTeX and LuaTeX need @@ -119658,10 +119830,10 @@ longdesc TeX systems are only read at iniTeX time, it is hoped that the longdesc UTF-8 patterns, with their converters, will completely supplant longdesc the older patterns. -containersize 15956 -containerchecksum 3232a96e27f7fd1932106f883688a00a5eb09531fd886bdc8cd755b094b1ce5a1aca2268c496751857d32ccf8745db3ad469d271227a21b05900a169c86a9e1d -doccontainersize 267296 -doccontainerchecksum 8cf1f1d2843b5208d692b1c2c839c86f7c25b2798b948615d0f1c6147f8e6a229ea9be3c09cd5c323408aaf212f6d76c9e1b5b8e2cf2b17ddbf833bdcd449b79 +containersize 15928 +containerchecksum 59bb1f656ed2f7e8343df2d2dc0709ad6b7d3e0c0f6ef0a699fb8550df6b00be6b1f074c06f21f063406c8f32ade16cac31c14a850d1ffe0ddf2db1e6e590107 +doccontainersize 267348 +doccontainerchecksum a5917f9c95989b7398f22a7993f8e542e74bc31d0e0c8ffb2ea6c76a2d4be2dd58303d39e100bd8b744f3901fc53d5218e0077ebcdc4ce668a962824e98938ed docfiles size=83 RELOC/doc/generic/hyph-utf8/CHANGES RELOC/doc/generic/hyph-utf8/HISTORY @@ -119673,8 +119845,8 @@ RELOC/doc/generic/hyph-utf8/img/texlive-collection.png RELOC/doc/luatex/hyph-utf8/README RELOC/doc/luatex/hyph-utf8/luatex-hyphen.pdf -srccontainersize 32204 -srccontainerchecksum fd5334d49d3efee5a62fc059bbfca6af9de84dc6b1acb02ea037320883b223cec8a8d521b708c6efbacfcfeffbd57f518b2127631ef15958a58d055cf0736820 +srccontainersize 32332 +srccontainerchecksum 51ac307348e3cbaf10af17dfe1e4e994e2b71cf91563db9c467d79babe35c6c1067b8c0a1c7882b551277952d2880ab1bc2ec8a75af6d37f95ded3c0ea98913f srcfiles size=55 RELOC/source/generic/hyph-utf8/README RELOC/source/generic/hyph-utf8/contributed/make-exhyph.pl @@ -119712,7 +119884,7 @@ RELOC/tex/luatex/hyph-utf8/luatex-hyphen.lua catalogue-also dehyph-exptl catalogue-ctan /language/hyph-utf8 -catalogue-date 2018-04-08 20:29:51 +0200 +catalogue-date 2018-07-26 19:12:09 +0200 catalogue-license other-free catalogue-topics hyphenation @@ -119803,15 +119975,15 @@ name hyphen-base category TLCore -revision 47260 +revision 48303 shortdesc core hyphenation support files relocated 1 longdesc Includes Knuth's original hyphen.tex, zerohyph.tex to disable longdesc hyphenation, language.us which starts the autogenerated files longdesc language.dat and language.def (and default versions of those), longdesc etc. -containersize 22380 -containerchecksum 7f64cbf85d9db7ece292be2679135092dd84333e464e4ebdfd74cb89e91ca4111d5dbcc94d5ff2137048687092ff3629d8cdcb499b2fec921e0912f10e4f304c +containersize 22400 +containerchecksum 445afd44630f10078cd5e2780ebfe5c27cc384956180fba70dce7afee00686d68bc3e3d7f34f014a76c4b246877bdce6ad64f375dcd5dad786432d1b19822a1c runfiles size=24 RELOC/tex/generic/config/language.dat RELOC/tex/generic/config/language.dat.lua @@ -119876,17 +120048,17 @@ name hyphen-bulgarian category TLCore -revision 47375 +revision 48290 shortdesc Bulgarian hyphenation patterns. relocated 1 longdesc Hyphenation patterns for Bulgarian in T2A and UTF-8 encodings. depend hyphen-base depend hyph-utf8 execute AddHyphen name=bulgarian lefthyphenmin=2 righthyphenmin=2 file=loadhyph-bg.tex file_patterns=hyph-bg.pat.txt file_exceptions= -containersize 28304 -containerchecksum 9a1428ff9bc364fb88941bb24e92738964982f3c8db15535404f63be7af7d7ed33a1e8782e76a4292c30693b9dbfe7fc66a7fe9d454d20c75d41d79d0c2b0612 +containersize 28288 +containerchecksum 6ba8204c3643c1bc6eafb30feb3ad611dd3088e3ade5e0a82e11ea7af0ff021300155a657d3e0319ecdf8acd1ad62aba88e7ce875eabd2b8b2905eae15d30912 doccontainersize 164660 -doccontainerchecksum edaa1187215fd3d32c14795ef616fcd5a12de4c4730752ae0195e526e73aa85d23f9c335f57e7258e8a263b351b86fe7076682006fd62332d21ccd17df85e6cb +doccontainerchecksum 6f02c405951790e35f5c134c8903c45c4222061d6dbfd24f4aa24bde31f0ebdcd629feeb1282d46e73216caa2a415a4efd2351320ea934dbd2d8526970fd50cf docfiles size=47 RELOC/doc/generic/hyph-utf8/bg/azbukaExtended.pdf RELOC/doc/generic/hyph-utf8/bg/azbukaExtended.tex @@ -120479,7 +120651,7 @@ name hyphen-indic category TLCore -revision 40340 +revision 48297 shortdesc Indic hyphenation patterns. relocated 1 longdesc Hyphenation patterns for Assamese, Bengali, Gujarati, Hindi, @@ -120496,11 +120668,12 @@ execute AddHyphen name=marathi lefthyphenmin=1 righthyphenmin=1 file=loadhyph-mr.tex file_patterns=hyph-mr.pat.txt file_exceptions= execute AddHyphen name=oriya lefthyphenmin=1 righthyphenmin=1 file=loadhyph-or.tex file_patterns=hyph-or.pat.txt file_exceptions= execute AddHyphen name=panjabi lefthyphenmin=1 righthyphenmin=1 file=loadhyph-pa.tex file_patterns=hyph-pa.pat.txt file_exceptions= +execute AddHyphen name=pali lefthyphenmin=1 righthyphenmin=1 file=loadhyph-pi.tex file_patterns=hyph-pi.pat.txt file_exceptions= execute AddHyphen name=tamil lefthyphenmin=1 righthyphenmin=1 file=loadhyph-ta.tex file_patterns=hyph-ta.pat.txt file_exceptions= execute AddHyphen name=telugu lefthyphenmin=1 righthyphenmin=1 file=loadhyph-te.tex file_patterns=hyph-te.pat.txt file_exceptions= -containersize 5404 -containerchecksum dd37d94473c7629dc3ca0ae4f74604cf97cda971db849114c586eff8fde3b7dde14d098c8eb4783136d902d5ba25b2e77abb04a43eb5ac66a8defb99c87cc03e -runfiles size=55 +containersize 6328 +containerchecksum 2662d3a36addf0ef9bd545129116336915bee3bafe0db7a13b22badd31077a27c9a76605acde50ebd5187a718bc9e6ce93ca9b66ba30e188d726a98eb53152ae +runfiles size=60 RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-as.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-bn.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-gu.tex @@ -120510,6 +120683,7 @@ RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-mr.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-or.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-pa.tex + RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-pi.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-ta.tex RELOC/tex/generic/hyph-utf8/loadhyph/loadhyph-te.tex RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-as.tex @@ -120521,6 +120695,7 @@ RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-mr.tex RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-or.tex RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-pa.tex + RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-pi.tex RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-ta.tex RELOC/tex/generic/hyph-utf8/patterns/tex/hyph-te.tex RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-as.chr.txt @@ -120559,6 +120734,10 @@ RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pa.hyp.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pa.lic.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pa.pat.txt + RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pi.chr.txt + RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pi.hyp.txt + RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pi.lic.txt + RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-pi.pat.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ta.chr.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ta.hyp.txt RELOC/tex/generic/hyph-utf8/patterns/txt/hyph-ta.lic.txt @@ -123280,6 +123459,32 @@ catalogue-license lppl catalogue-topics font font-type1 font-decor +name inline-images +category Package +revision 48415 +shortdesc Inline images in base64 encoding +relocated 1 +longdesc The package provides a command \inlineimg to dynamically create +longdesc a file containing the inline image in base64 format, which is +longdesc decoded and included in the source file. Requirements LaTeX +longdesc must be run with option --shell-escape. Program base64. +containersize 780 +containerchecksum ae88646433bc16d0335f72d9f761a89184f41f2fde746d788b804cafc974a73275514dbe95216dcc8b7e83b0c2150e00c7da0918cd5912e609ac64aedf4324b4 +doccontainersize 123068 +doccontainerchecksum 2796d176a59f095e62fada630a6153324c5f61c7948c1a0d2599a88b6867f45a596d2ad0397fd6b18ead3b75e9897c29394b9a4f545c50a367b29ea987633821 +docfiles size=37 + RELOC/doc/latex/inline-images/README.md details="Readme" + RELOC/doc/latex/inline-images/examples/example.pdf + RELOC/doc/latex/inline-images/examples/example.tex + RELOC/doc/latex/inline-images/screenshots/example.jpg +runfiles size=1 + RELOC/tex/latex/inline-images/inline-images.sty +catalogue-ctan /macros/latex/contrib/inline-images +catalogue-date 2018-08-16 19:12:20 +0200 +catalogue-license lgpl3 +catalogue-topics image-supp +catalogue-version 1.0 + name inlinebib category Package revision 22018 @@ -123966,31 +124171,30 @@ name invoice category Package -revision 39397 +revision 48359 shortdesc Generate invoices relocated 1 longdesc The package may be used for generating invoices. The package longdesc can deal with invisible expense items and deductions; output -longdesc may be presented in any of 10 different languages. The package -longdesc depends on the fp and calc packages for its calculations. -containersize 8292 -containerchecksum 2264bf1415acc39bb8514b0533a9d67a2a35fb121435b8c08df6688af7ae146b9eb3795e5c829ca471bea687fe0a85c02e932de460d466e45ac5aba667afdea8 -doccontainersize 132952 -doccontainerchecksum 047667980e7db3cce019a609fc4c804f04177137b4c78da11c382512edafaa5d588ad579d7fa91884718a5d89cb95f1f7960651a601298b57f1522f1332c28e7 -docfiles size=49 - RELOC/doc/latex/invoice/00README.tex - RELOC/doc/latex/invoice/copying - RELOC/doc/latex/invoice/history - RELOC/doc/latex/invoice/install +longdesc may be presented in any of 10 different languages. A +longdesc long-standing bug has been removed. Numbers now can show the +longdesc comma as decimal separator. The package depends on the fp, calc +longdesc and packages for its calculations. +containersize 8748 +containerchecksum f1d08d9ad7cf1ae2c0a5f8850e4cc036947a5d35e71b815942d9aaf431ad3e00a73043a29849f1c108ae508ae6919e2c0e01fc60bb645458138724a6bc6a97f5 +doccontainersize 101844 +doccontainerchecksum 79007cb97f061171de3df6e10ed36c874da388f97d321cfb5be117b68cf635ace12b6532a51fa0048cb2ba3b3f5124f0754c41c4cd8a8f5daee91b17e70b235c +docfiles size=32 + RELOC/doc/latex/invoice/README details="Readme" RELOC/doc/latex/invoice/invoice.pdf details="Package documentation" RELOC/doc/latex/invoice/invoice.tex -runfiles size=12 - RELOC/tex/latex/invoice/invoice.def +runfiles size=13 RELOC/tex/latex/invoice/invoice.sty -catalogue-also facture + RELOC/tex/latex/invoice/invoicelabels.sty +catalogue-also facture invoice2 catalogue-ctan /macros/latex/contrib/invoice -catalogue-date 2016-06-24 19:18:15 +0200 -catalogue-license gpl +catalogue-date 2018-08-06 13:29:29 +0200 +catalogue-license lppl1.3c catalogue-topics invoice name invoice2 @@ -131127,18 +131331,18 @@ name jlreq category Package -revision 48039 +revision 48414 shortdesc Japanese document class based on requirements for Japanese text layout relocated 1 longdesc This package provides a Japanese document class based on longdesc requirements for Japanese text layout. The class file and the longdesc JFM (Japanese font metric) files for LuaTeX-ja / pLaTeX / longdesc upLaTeX are provided. -containersize 85992 -containerchecksum 5fffc0ed0c0a1e425cc317f172872dc3a82b4ea2acf2b8291915fade402c94d8aae253de03a9944339eb55552ec08695d0791e9224a9696543b10b1e5e22f7d4 -doccontainersize 18544 -doccontainerchecksum 0a12bfb2feeb1ea1d61f7f994025df8a6c59e76000f3c17223824e41f82a7f0e2625e2d379b90cec56fb5cca1f3dd9f8deadc0cbf128941050d19ca30e584e75 -docfiles size=29 +containersize 89876 +containerchecksum 8fb4884e5ac9461facfe8d6b5ad639806e2dbce914b6efaf522192c017b356614cc79e3ceb7a9670a060ffd906a15f8897d1d22d22155f92059673980520194e +doccontainersize 20032 +doccontainerchecksum 4f497a720c056cf5aa34926ae889c73ac8d665504e11c7916e8dd6d62dc8c6becd55765d641ea6dbc96adb98778fd2018ac2a4d6713702a938c85999bba146ef +docfiles size=30 RELOC/doc/latex/jlreq/LICENSE RELOC/doc/latex/jlreq/README-ja.md details="Readme" language="ja" RELOC/doc/latex/jlreq/README.md details="Readme" @@ -131148,7 +131352,7 @@ RELOC/doc/latex/jlreq/jlreq-trimmarks.html RELOC/doc/latex/jlreq/jlreq-trimmarks.md RELOC/doc/latex/jlreq/jlreq.html -runfiles size=3213 +runfiles size=3221 RELOC/fonts/tfm/public/jlreq/bjlreq-v.tfm RELOC/fonts/tfm/public/jlreq/bjlreq.tfm RELOC/fonts/tfm/public/jlreq/bjlreqg-v.tfm @@ -131235,7 +131439,7 @@ RELOC/tex/luatex/jlreq/jfm-jlreq.lua RELOC/tex/luatex/jlreq/jfm-jlreqv.lua catalogue-ctan /language/japanese/jlreq -catalogue-date 2018-06-17 11:50:33 +0200 +catalogue-date 2018-08-16 06:44:14 +0200 catalogue-license bsd2 catalogue-topics japanese font-cjk class @@ -133547,7 +133751,7 @@ name knowledge category Package -revision 47739 +revision 48280 shortdesc Displaying, hyperlinking, and indexing notions in a document relocated 1 longdesc The package offers a systematic way to handle @@ -133555,18 +133759,18 @@ longdesc an index. In combination with hyperref it makes it easy to have longdesc every reference of a concept linked to its introduction. It longdesc also offers simple notations. -containersize 19508 -containerchecksum 623c3892fe6109039b86c4b394bbd411c7dadd070a185250070d53f722a0772afa1ab147f74ab4cd1a7df9830cd4b255776cc09eeeb012c0502cb4f70440aed2 -doccontainersize 711324 -doccontainerchecksum 8557c52b3b6f2ab3bf835f48eac9006166fdb408a8a12b79fa02a56fe33906d19ee485af5874ab9a11e83536d4554d98d79c404aec52a03681b5430b76e53f78 +containersize 19500 +containerchecksum defddfd7435905e12f24620484a13ad0f5d15e72ed9053d9ad746666cba9d13429a8493b0c64b5bae8b606eb2926f12766557709cc13e237c9a750bf14521d6d +doccontainersize 711460 +doccontainerchecksum f1c4287f7550965a894221d6fb2954f796ba44fb5e99dd5df011761fc1b61f35171ad5ebf62ca302145511f8d51da01c7c687e0c4030a1963fdf3e74a076e25e docfiles size=204 RELOC/doc/latex/knowledge/README.md details="Readme" RELOC/doc/latex/knowledge/knowledge-example.tex RELOC/doc/latex/knowledge/knowledge.pdf details="Package documentation" RELOC/doc/latex/knowledge/knowledge.tex RELOC/doc/latex/knowledge/makefile -srccontainersize 36164 -srccontainerchecksum f7144f903a7240fb7cd80e13db5629b3b4a24827b1915d5fd684a1bdea0b5dc837930e829412ac1b8fdcc6aaa787f94b84682619734434c2e5167e1edcb50041 +srccontainersize 36268 +srccontainerchecksum d1babfc870c948f1438c2f4bb7f283e793319f59bf8a13553adab3f0347edfb8f8ba45c413060b249d3facb224e3a0c2ddd7b9325ba3d17ead6a9c25518eb13a srcfiles size=48 RELOC/source/latex/knowledge/knowledge-code.dtx RELOC/source/latex/knowledge/knowledge-configuration.dtx @@ -133575,10 +133779,10 @@ runfiles size=29 RELOC/tex/latex/knowledge/knowledge.sty catalogue-ctan /macros/latex/contrib/knowledge -catalogue-date 2018-05-17 19:03:40 +0200 +catalogue-date 2018-07-26 12:12:52 +0200 catalogue-license lppl1.2 catalogue-topics index label-ref -catalogue-version 1.11 +catalogue-version 1.12 name knuth category Package @@ -135069,7 +135273,7 @@ name kpfonts category Package -revision 29803 +revision 48470 shortdesc A complete set of fonts for text and mathematics relocated 1 longdesc The family contains text fonts in roman, sans-serif and @@ -135088,13 +135292,14 @@ longdesc though the fonts are very clearly different in appearance from longdesc their parent. execute addMap kpfonts.map -containersize 2373952 -containerchecksum 8dad1340476c33971596211b1249313ce8442909c7c0c4b90402f4d825bc3f690bb08a08a7259c7cf5934fd71b82bc70af4f16e822e5dde035acdfbe3bf6f4e1 -doccontainersize 1742044 -doccontainerchecksum 2e787b77411fb2fa3560070cd6fd0e5a5a1299f6a5e63ce647b1cde3170df799198c65c9a98fcdfbf48c8b7b32ebefcdb0987ae04d25a0e9083370474ae71b2e -docfiles size=567 +containersize 2224148 +containerchecksum e6997f0a3cba6f4de6860986569dacec3ca381f1c13e045539a74e4e2e7f84656a042416cdc7adf3f77ae9b58d77baac4782d0374dee56fd2e6a6301678cb29b +doccontainersize 1759368 +doccontainerchecksum 65c2fc56d27f6bf3bccbbaaa31276f2f3918e0b0de4a4b7708847f5af26630f10e84236bc33a682dcd101c7ac62b68455f0ae521a0be0e14c794e38159a70eeb +docfiles size=544 RELOC/doc/fonts/kpfonts/Kpfonts-Doc-French.pdf details="Package documentation (French)" language="fr" RELOC/doc/fonts/kpfonts/Kpfonts-Doc-French.tex + RELOC/doc/fonts/kpfonts/README.txt details="Readme" RELOC/doc/fonts/kpfonts/christophe.cls RELOC/doc/fonts/kpfonts/kpfonts-abstract.pdf details="Summary of features" RELOC/doc/fonts/kpfonts/kpfonts-abstract.tex @@ -135102,72 +135307,17 @@ RELOC/doc/fonts/kpfonts/kpfonts-math-symbols-tables.tex RELOC/doc/fonts/kpfonts/kpfonts.pdf details="Package documentation (English)" language="en" RELOC/doc/fonts/kpfonts/kpfonts.tex - RELOC/doc/fonts/kpfonts/readme.txt -runfiles size=3918 - RELOC/fonts/afm/public/kpfonts/jkpbit8a.afm - RELOC/fonts/afm/public/kpfonts/jkpbitc.afm - RELOC/fonts/afm/public/kpfonts/jkpbite.afm - RELOC/fonts/afm/public/kpfonts/jkpbn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpbnc.afm - RELOC/fonts/afm/public/kpfonts/jkpbne.afm - RELOC/fonts/afm/public/kpfonts/jkpbsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkpbsce.afm - RELOC/fonts/afm/public/kpfonts/jkpkbsc.afm - RELOC/fonts/afm/public/kpfonts/jkpkmsc.afm - RELOC/fonts/afm/public/kpfonts/jkplbit8a.afm - RELOC/fonts/afm/public/kpfonts/jkplbitc.afm - RELOC/fonts/afm/public/kpfonts/jkplbite.afm - RELOC/fonts/afm/public/kpfonts/jkplbn8a.afm - RELOC/fonts/afm/public/kpfonts/jkplbnc.afm - RELOC/fonts/afm/public/kpfonts/jkplbne.afm - RELOC/fonts/afm/public/kpfonts/jkplbsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkplbsce.afm - RELOC/fonts/afm/public/kpfonts/jkplkbsc.afm - RELOC/fonts/afm/public/kpfonts/jkplkmsc.afm - RELOC/fonts/afm/public/kpfonts/jkplmit8a.afm - RELOC/fonts/afm/public/kpfonts/jkplmitc.afm - RELOC/fonts/afm/public/kpfonts/jkplmite.afm - RELOC/fonts/afm/public/kpfonts/jkplmn8a.afm - RELOC/fonts/afm/public/kpfonts/jkplmnc.afm - RELOC/fonts/afm/public/kpfonts/jkplmne.afm - RELOC/fonts/afm/public/kpfonts/jkplmsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkplmsce.afm - RELOC/fonts/afm/public/kpfonts/jkpmit8a.afm - RELOC/fonts/afm/public/kpfonts/jkpmitc.afm - RELOC/fonts/afm/public/kpfonts/jkpmite.afm - RELOC/fonts/afm/public/kpfonts/jkpmn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpmnc.afm - RELOC/fonts/afm/public/kpfonts/jkpmne.afm - RELOC/fonts/afm/public/kpfonts/jkpmsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkpmsce.afm - RELOC/fonts/afm/public/kpfonts/jkpssbn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpssbnc.afm - RELOC/fonts/afm/public/kpfonts/jkpssbne.afm - RELOC/fonts/afm/public/kpfonts/jkpssbsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkpssbsce.afm - RELOC/fonts/afm/public/kpfonts/jkpsskbsc.afm - RELOC/fonts/afm/public/kpfonts/jkpsskmsc.afm - RELOC/fonts/afm/public/kpfonts/jkpssmn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpssmnc.afm - RELOC/fonts/afm/public/kpfonts/jkpssmne.afm - RELOC/fonts/afm/public/kpfonts/jkpssmsc8a.afm - RELOC/fonts/afm/public/kpfonts/jkpssmsce.afm - RELOC/fonts/afm/public/kpfonts/jkpttbn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpttbnc.afm - RELOC/fonts/afm/public/kpfonts/jkpttbne.afm - RELOC/fonts/afm/public/kpfonts/jkpttmn8a.afm - RELOC/fonts/afm/public/kpfonts/jkpttmnc.afm - RELOC/fonts/afm/public/kpfonts/jkpttmne.afm +srccontainersize 223552 +srccontainerchecksum f8e1782af4d99309c6b8ffa634f2689a45d70e101e3f841d2ce17b286a3beda1b3a0661eea6982e192954c5e8b09fd8653084a120dcd62b6bb7f909ea901235f +srcfiles size=76 + RELOC/source/fonts/kpfonts/afm.zip + RELOC/source/fonts/kpfonts/kpfonts-fontinst.zip +runfiles size=3713 RELOC/fonts/enc/dvips/kpfonts/kpfonts-expert-sc.enc RELOC/fonts/enc/dvips/kpfonts/kpfonts-expert-tt.enc RELOC/fonts/enc/dvips/kpfonts/kpfonts-expert.enc RELOC/fonts/enc/dvips/kpfonts/kpfonts-large-sc.enc - RELOC/fonts/enc/pdftex/kpfonts/kpfonts-expert-sc.enc - RELOC/fonts/enc/pdftex/kpfonts/kpfonts-expert-tt.enc - RELOC/fonts/enc/pdftex/kpfonts/kpfonts-expert.enc - RELOC/fonts/enc/pdftex/kpfonts/kpfonts-large-sc.enc RELOC/fonts/map/dvips/kpfonts/kpfonts.map - RELOC/fonts/source/public/kpfonts/kpfonts-fontinst.zip RELOC/fonts/tfm/public/kpfonts/jkpbex.tfm RELOC/fonts/tfm/public/kpfonts/jkpbexa.tfm RELOC/fonts/tfm/public/kpfonts/jkpbit7c.tfm @@ -137019,10 +137169,10 @@ RELOC/tex/latex/kpfonts/ujkpsyd.fd RELOC/tex/latex/kpfonts/ujkpsydw.fd catalogue-ctan /fonts/kpfonts -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-23 18:35:53 +0200 catalogue-license gpl -catalogue-topics font font-type1 font-sans font-mono -catalogue-version 3.31 +catalogue-topics font font-type1 font-serif font-sans font-mono font-maths +catalogue-version 3.33 name ksfh_nat category Package @@ -137965,7 +138115,7 @@ name l3build category Package -revision 47669 +revision 48367 shortdesc A testing and building system for (La)TeX longdesc The build system supports testing and building LaTeX3 code, on longdesc Linux, Mac OS X and Windows systems. The package offers: A unit @@ -137976,22 +138126,23 @@ longdesc material released by the LaTeX3 team, and may be updated on a longdesc different schedule. depend l3build.ARCH -containersize 26452 -containerchecksum 34109f59c3180a480c496408e47e83bcd286fc772ed0889458d8e060d967fe3031c9ab3263f59ef7d9e64bcb00f02c048770274765f869e49caef12186bcd0b1 -doccontainersize 684412 -doccontainerchecksum 29d2ffe532403d2debfc4d04350589fec7417d1d4044f28bd9b139d84d8eb42916b6c1d08bd5d2a29a8f983fb38fca28d6f54763f02b852c0cf1297b5172108c -docfiles size=171 +containersize 27404 +containerchecksum 822ea350f9aa9e052a19ca5feb0b2e324c85a062e5fe7e0197c874c82e43cda6af4fd198f3b8cd95840e02b44e3471acc6d1a88460c4e7a376935b482c1cabe8 +doccontainersize 687660 +doccontainerchecksum 6bb9ae18130c15694195072f197a8acc04e2e1c5f72018b2c0a3d0f7bdcab8cb18af580d765d8369c5e75a989e7b66c2acad69ac5da94219b865dea7c4091bdd +docfiles size=174 + texmf-dist/doc/latex/l3build/CHANGELOG.md texmf-dist/doc/latex/l3build/CONTRIBUTING.md texmf-dist/doc/latex/l3build/README.md details="Readme" texmf-dist/doc/latex/l3build/l3build.pdf details="Package documentation" texmf-dist/doc/man/man1/l3build.1 texmf-dist/doc/man/man1/l3build.man1.pdf -srccontainersize 23788 -srccontainerchecksum 4fcd3680c811e9368b37c4c58a56d13d71ffa0efac6b0951e77248b78a1a78de4aff98d9b6aaf8223a0f0bc087e8e0479850a03ff38f2eb6822c51bad7576690 +srccontainersize 24576 +srccontainerchecksum 92f59fd524ba7cd91774b1f905714510610b4d0c418b1cf3c6c492413b7c1a784a6fcd2294d149ec0243195b5ba501cfc8f0b13e1f6e0436c93f17f60f15a14f srcfiles size=22 texmf-dist/source/latex/l3build/l3build.dtx texmf-dist/source/latex/l3build/l3build.ins -runfiles size=34 +runfiles size=37 texmf-dist/scripts/l3build/l3build-arguments.lua texmf-dist/scripts/l3build/l3build-aux.lua texmf-dist/scripts/l3build/l3build-check.lua @@ -138010,7 +138161,7 @@ texmf-dist/scripts/l3build/l3build.lua texmf-dist/tex/latex/l3build/regression-test.tex catalogue-ctan /macros/latex/contrib/l3build -catalogue-date 2018-05-10 15:29:03 +0200 +catalogue-date 2018-08-07 18:56:06 +0200 catalogue-license lppl1.3c catalogue-topics package-devel macro-supp @@ -143564,17 +143715,17 @@ name latexindent category Package -revision 47964 +revision 48402 shortdesc Indent a LaTeX document, highlighting the programming structure longdesc The Perl script (also available as a windows executable) longdesc processes a LaTeX file, indenting parts so as to highlight the longdesc structure for the reader. depend latexindent.ARCH -containersize 49704 -containerchecksum e10c18650ef587cd6f9aa9a2945c706a57f8370021c9c9b18e5130d80fba97a1edce192c9a269683217509d1d6e196077ee731553641fe6bb48a9cbbab9ade9a -doccontainersize 718176 -doccontainerchecksum 9c190d8406e1f255168f2fcf4c7b6c047d2d375413f2d58ae83edb0005699a8676738207cbf591b50032e732c28ff1288a51a59f783ba74d9dd9431a9fcfce19 -docfiles size=248 +containersize 51716 +containerchecksum a3b935c1e81a346cbbe32642b730c7fe934338899e7e117d3f45227d2cf1ba020b9074ebbd2cfedf056f8e08cd099ceb3d6c044909ede01a51e26f492436cb06 +doccontainersize 761128 +doccontainerchecksum 3689351ad94a8e38e448ba4918572e89abb520bbedfc88822fa9e5e8aa953902a24e637e8cbc2d32bbaadda51e8000c44b7efd01a47125014cfb401e8a7e55c3 +docfiles size=260 texmf-dist/doc/support/latexindent/README details="Readme" texmf-dist/doc/support/latexindent/appendices.tex texmf-dist/doc/support/latexindent/cmhlistings.tex @@ -143603,7 +143754,7 @@ texmf-dist/doc/support/latexindent/subsubsec-no-add-remaining-code-blocks.tex texmf-dist/doc/support/latexindent/subsubsec-special.tex texmf-dist/doc/support/latexindent/title.tex -runfiles size=104 +runfiles size=109 texmf-dist/scripts/latexindent/LatexIndent/AlignmentAtAmpersand.pm texmf-dist/scripts/latexindent/LatexIndent/Arguments.pm texmf-dist/scripts/latexindent/LatexIndent/BackUpFileProcedure.pm @@ -143641,10 +143792,10 @@ texmf-dist/scripts/latexindent/defaultSettings.yaml texmf-dist/scripts/latexindent/latexindent.pl catalogue-ctan /support/latexindent -catalogue-date 2018-06-08 14:30:04 +0200 +catalogue-date 2018-08-13 22:49:51 +0200 catalogue-license gpl3 catalogue-topics code-layout -catalogue-version 3.4.3 +catalogue-version 3.5 name latexindent.aarch64-linux category Package @@ -143738,11 +143889,11 @@ name latexindent.win32 category Package -revision 47964 +revision 48402 shortdesc win32 files of latexindent -containersize 8048144 -containerchecksum 9f640668431914838fc5a17b94ec361e726bab5393bbd567c297816545dccc760d986aca1ee97e8cf4ddd2550872576688c92b92740b72ee8bf5cce3643105eb -binfiles arch=win32 size=2797 +containersize 8050968 +containerchecksum 916b94b9bc9e18d7dc2ddfc8a69f5ee30987a70b85c3aeaf394b952609636e0541c5cd0582a1d2d25433f3705ef1b8233528bec08267154615a7b97648d28d83 +binfiles arch=win32 size=2798 bin/win32/latexindent.exe name latexindent.x86_64-cygwin @@ -143801,7 +143952,7 @@ name latexmk category Package -revision 47836 +revision 48369 shortdesc Fully automated LaTeX document generation longdesc Latexmk completely automates the process of generating a LaTeX longdesc document. Given the source files for a document, latexmk issues @@ -143813,11 +143964,11 @@ longdesc changed. Thus a previewer can offer a display of the document's longdesc latest state. depend latexmk.ARCH -containersize 85884 -containerchecksum a1fa2694f6549a2eb65138eabdd37a2cdbcf89e970bfde3a936934af4ba6932fbbfc8e96848be5536007872725ee93d014bb6501c82ef7b46041667884ae15c9 -doccontainersize 449164 -doccontainerchecksum fe90963f10ae790ca86b2235cf890ab3d24f27931b29e2510f764d1bb3f093bc77868d9960f6b477691c3e9b2d84d9cc98495e42a26db572ba8e575699231a4c -docfiles size=231 +containersize 86972 +containerchecksum 789d992a8907d63d4c39bea774447b95cf9d3afa9a7f9940ca0e5ba0e74138759937d31e35d701dd52c3ba640e814faec4e593fcbe1a7b095acc440985dd136e +doccontainersize 458308 +doccontainerchecksum f1789dcb25fa023f9c3b977cd5665fdff48190d753ee5c10a1afa14be20bc1db4baa052a8d9883c37ad6dd3a7704c5942fd30756ea35c8630b3f7d7eb1ee8cde +docfiles size=236 texmf-dist/doc/man/man1/latexmk.1 texmf-dist/doc/man/man1/latexmk.man1.pdf texmf-dist/doc/support/latexmk/CHANGES @@ -143839,6 +143990,7 @@ texmf-dist/doc/support/latexmk/example_rcfiles/sweave_latexmkrc texmf-dist/doc/support/latexmk/example_rcfiles/tex4ht-latexmkrc texmf-dist/doc/support/latexmk/example_rcfiles/texinfo-latexmkrc + texmf-dist/doc/support/latexmk/example_rcfiles/tikz-externalized-latexmkrc texmf-dist/doc/support/latexmk/example_rcfiles/xelatex_latexmkrc texmf-dist/doc/support/latexmk/extra-scripts/README-latexmk-scripts texmf-dist/doc/support/latexmk/extra-scripts/dvipdfm_call @@ -143856,17 +144008,17 @@ texmf-dist/doc/support/latexmk/latexmk.pdf details="Manual page, PDF" texmf-dist/doc/support/latexmk/latexmk.txt details="Manual page, text format" srccontainersize 492 -srccontainerchecksum c2be27e73f0171a6459983dcbe7b8b58d8d701b0136cd3bdd92399bc772f7261cf62a911f82114d64b28b807ada3c8a5b818822b658a554f425c31e6774cf456 +srccontainerchecksum 366ffae340bfcb92f4af6b48c2657502f1f2e4650e54bad585d94e25693fc034e51a7be249fd7c5e1f61c8e2cda7467dbfff46e00a57ec91b192f03e9e5c013c srcfiles size=1 texmf-dist/source/support/latexmk/latexmk.bat -runfiles size=91 +runfiles size=92 texmf-dist/scripts/latexmk/latexmk.pl catalogue-also latexn prv arara catalogue-ctan /support/latexmk -catalogue-date 2018-05-25 18:46:21 +0200 +catalogue-date 2018-08-07 20:54:06 +0200 catalogue-license gpl2 catalogue-topics compilation -catalogue-version 4.56 +catalogue-version 4.59 name latexmk.aarch64-linux category Package @@ -146908,7 +147060,7 @@ name lettrine category Package -revision 38268 +revision 48450 shortdesc Typeset dropped capitals relocated 1 longdesc The lettrine package supports various dropped capitals styles, @@ -146916,25 +147068,25 @@ longdesc particular, it has facilities for the paragraph text's left longdesc edge to follow the outline of capitals that have a regular longdesc shape (such as "A" and "V"). -containersize 5452 -containerchecksum 49e60d7da551e8034f4a979869683e955888a7fa2e6dd37c38a8ec98c883847c6ba583d8d5cd69fedea0e55b92350cccc8ba8b92d905d9f843ed1951283d6db6 -doccontainersize 472116 -doccontainerchecksum 7d99212455e00a7b7c917a019166a462084e4951bc70908a383bbffdee6fa9561ea8a694e0d08d1b83fdb25afe32e2bb593ddaece8eabb612363093b3502100d -docfiles size=143 +containersize 5808 +containerchecksum 11a69d563e49aa3efb0620b889967574973ada53d2463820d1e3a5cb853bf0ad2dfaef8e6d32d62b1a8dba7066ace19286b06f9f44063ab82cc86793680ef0b0 +doccontainersize 368560 +doccontainerchecksum 05409767edb76a5c0dfb4b7aadea19810ef02af36dd69a229fa7b86c6148fa4428f8e131110253a881771fd5806d1d71c9b6e423f863589e6a8c76334722789d +docfiles size=107 RELOC/doc/latex/lettrine/README details="Readme" - RELOC/doc/latex/lettrine/W.eps - RELOC/doc/latex/lettrine/W.pdf RELOC/doc/latex/lettrine/demo-de.pdf details="Package examples (German)" language="de" RELOC/doc/latex/lettrine/demo-de.tex RELOC/doc/latex/lettrine/demo.pdf details="Package examples (French)" language="fr" RELOC/doc/latex/lettrine/demo.tex RELOC/doc/latex/lettrine/lettrine.pdf details="Package documentation" -srccontainersize 11728 -srccontainerchecksum 81c4229221d9a4479de52d19c6112b00b7e9a8059ad238b210f7b6823204b4681cd91068bfe4e56fee2a0945f6da1ecafa78d7b46aa93e66a18955c8ca9f120d -srcfiles size=11 +srccontainersize 15700 +srccontainerchecksum 43e477b143a7a11b72db01a7dee10bac36522210d080b0b60d7cd5a43efe62b4909c713a84a88f29b6de503bda530d36eabb6ea11d7ad3374bbd6b0251d040c7 +srcfiles size=19 + RELOC/source/latex/lettrine/contrib.dtx + RELOC/source/latex/lettrine/contrib.ins RELOC/source/latex/lettrine/lettrine.dtx RELOC/source/latex/lettrine/lettrine.ins -runfiles size=11 +runfiles size=12 RELOC/tex/latex/lettrine/lettrine.cfg RELOC/tex/latex/lettrine/lettrine.sty RELOC/tex/latex/lettrine/optfile.cfl @@ -146943,10 +147095,10 @@ RELOC/tex/latex/lettrine/pzc2.cfl RELOC/tex/latex/lettrine/pzc3.cfl catalogue-ctan /macros/latex/contrib/lettrine -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-21 13:27:22 +0200 catalogue-license lppl1.3 catalogue-topics lettrine -catalogue-version 1.9 +catalogue-version 2.1 name levy category Package @@ -150692,7 +150844,7 @@ name libertinus-otf category Package -revision 48165 +revision 48464 shortdesc Support for Libertinus OpenType relocated 1 longdesc This package offers LuaLaTeX/XeLaTeX support for the Libertinus @@ -150701,27 +150853,27 @@ longdesc styles are provided, which have been derived from the ones in longdesc the libertinus package itself. The Libertinus fonts are longdesc similiar to Libertine and Biolinum, but come with math symbols. -containersize 2109620 -containerchecksum e33168f0b5a1aae356c2adfd4422d90ed54a8c06c5b76c149b8bba378f68b30b18461580aaf7ddcf74f0cafb3a268164eb1b5761b851022198731252506f9d5a -doccontainersize 451968 -doccontainerchecksum c1540c64ebe6950d93030faba756b6098e7036ece3e6c62a86296a91a9f001527dfbb925725fee4767cf34c1af62fdcf9c5e2c07f286e668aa5cc07a35357815 -docfiles size=121 +containersize 1988500 +containerchecksum 28aff0816d8b301177baa5e1ae5101c972fe5b70287c8424f15cc6e0068b2e8a7ff4d6c302b48fa0554968f641a84df86e1accc0355127bee606c66ecc3d44a7 +doccontainersize 442024 +doccontainerchecksum 1a055f4ba187d6f63f681638ec6656432b5d173ade8880fbeac36db871ec616a7086c18f7ea5467eaf7c7236b02a4081059a9fef96a2a3c0e202240aea4fd57c +docfiles size=118 RELOC/doc/fonts/libertinus-otf/Changes RELOC/doc/fonts/libertinus-otf/README.md details="Readme" RELOC/doc/fonts/libertinus-otf/libertinus-otf-doc.pdf details="Package documentation" RELOC/doc/fonts/libertinus-otf/libertinus-otf-doc.tex -runfiles size=1283 +runfiles size=1262 RELOC/fonts/opentype/public/libertinus-otf/libertinusmath-bold.otf RELOC/fonts/opentype/public/libertinus-otf/libertinusmono-bold.otf - RELOC/fonts/opentype/public/libertinus-otf/libertinusmono-boldoblique.otf - RELOC/fonts/opentype/public/libertinus-otf/libertinusmono-oblique.otf + RELOC/fonts/opentype/public/libertinus-otf/libertinusmono-bolditalic.otf + RELOC/fonts/opentype/public/libertinus-otf/libertinusmono-italic.otf RELOC/fonts/opentype/public/libertinus-otf/libertinussans-bolditalic.otf RELOC/tex/latex/libertinus-otf/libertinus-otf.sty catalogue-ctan /fonts/libertinus-otf -catalogue-date 2018-07-07 22:14:51 +0200 +catalogue-date 2018-08-22 22:08:15 +0200 catalogue-license lppl1.3ofl catalogue-topics font font-otf font-supp font-sans font-mono font-maths -catalogue-version 0.09 +catalogue-version 0.11 name libertinust1math category Package @@ -155158,17 +155310,17 @@ name lshort-chinese category Package -revision 43606 +revision 48394 catalogue lshort-zh-cn shortdesc Introduction to LaTeX, in Chinese relocated 1 longdesc A Chinese edition of the not so short introduction to LaTeX2e, longdesc with additional information of typesetting Chinese language. containersize 444 -containerchecksum 8cd8b33e17ebb8ac344e6335a4c66cbbba5be9ac100e2171be231f70f0fd093b58fbae165a1196183ceecd53b6f2755dd650cb4e935c6023c14b74357cc5dddb -doccontainersize 1493052 -doccontainerchecksum d463de005aa843c81456470d14102eb405aee8cb05ca5918735231f789597c2e565ce352dd423ef95b38d411bf97d7d209255cdca872d892b190221a96080280 -docfiles size=437 +containerchecksum 91727dd4309cc7bff22cd36563eb4b460bb6f8f2120ab9226539171ecced772a43cdc5cfe7fdf02b4966d3f6ab215a5b5cbad27d5184aa06d53a7e09788655ed +doccontainersize 1500860 +doccontainerchecksum 84f9ab2d8e93dac2dc7fb2653e8d2de8601a5ef0746c6aa52f3ae31f467b047b39444fcd89d0b0b2d889e8a5e6d3fdbb71cbc4b0b5ea22d44bd9e416d6375a24 +docfiles size=439 RELOC/doc/latex/lshort-chinese/README-zh.md details="Readme (Chinese)" language="zh" RELOC/doc/latex/lshort-chinese/README.md details="Readme" RELOC/doc/latex/lshort-chinese/lshort-zh-cn.pdf details="The document itself" language="zh" @@ -155196,10 +155348,10 @@ RELOC/doc/latex/lshort-chinese/src/lshort-zh-cn.tex RELOC/doc/latex/lshort-chinese/src/make.bat catalogue-ctan /info/lshort/chinese -catalogue-date 2017-03-26 19:47:00 +0200 +catalogue-date 2018-08-10 21:57:48 +0200 catalogue-license fdl catalogue-topics tut-latex chinese-doc -catalogue-version 5.10 +catalogue-version 5.11 name lshort-czech category Package @@ -157518,20 +157670,20 @@ name lualatex-truncate category Package -revision 47915 +revision 48469 shortdesc A wrapper for using the truncate package with LuaLaTeX relocated 1 longdesc This package provides a wrapper for the truncate package, thus longdesc fixing issues related to LuaTeX's hyphenation algorithm. -containersize 1652 -containerchecksum 56bceb5a3549268d7bb999b60c54d74a394bfc313dc38cd4584772f6040c6cceb7e971a40014e148529b4c4e1e95d662065013470927b6c4ecae207756543784 -doccontainersize 60880 -doccontainerchecksum e31bf4d50ec0a79f6e5fdbac12dcaaeba27c786eea162e906c428efc66761c17d63d8becb40d46bc132a1cad93c03de2aebf46c8e95c8ceb7acd17c189f6e477 +containersize 1880 +containerchecksum a1a5f1f657b9157ee9e6011aabe632a8cebfe9ed53d3a36f4155b6c474232ffda5acc6ce1c6aeb8916322e958a171c156520ad564e41c005c4abf83e4610eda4 +doccontainersize 62748 +doccontainerchecksum 568ab68bf891e4c0d7d3a67554a51404bc3a26f8c8f9211049b1d2902ac77950728e9a24b557a5a35d4157835fec2f79ab459bcd179c41af8cd53214b9206435 docfiles size=17 RELOC/doc/lualatex/lualatex-truncate/README.md details="Readme" RELOC/doc/lualatex/lualatex-truncate/lualatex-truncate-doc.pdf details="Package documentation" -srccontainersize 4996 -srccontainerchecksum 83e8db297d916182993aa34b6ab6639e08f3125a7c352f3007f08e8b1be2fdae25e788732b99d581dbc5a507cba3b4c4f0aa21f7e7d83eab37fe3c3d0c3d2e06 +srccontainersize 5392 +srccontainerchecksum 259058ce56ddb534e758b6bedc400a9fc18b72c83785621006424cb3cbfca1ad10421dab0a9f7dfab4f083ee1c605b9ed454adab8322fd6fff5b40823b465073 srcfiles size=6 RELOC/source/lualatex/lualatex-truncate/lualatex-truncate-doc.dtx RELOC/source/lualatex/lualatex-truncate/lualatex-truncate.dtx @@ -157540,10 +157692,10 @@ RELOC/tex/lualatex/lualatex-truncate/lualatex-truncate.sty catalogue-also truncate catalogue-ctan /macros/luatex/latex/lualatex-truncate -catalogue-date 2018-06-03 19:51:27 +0200 +catalogue-date 2018-08-22 22:23:58 +0200 catalogue-license lppl1.3c catalogue-topics layout luatex -catalogue-version 1.0 +catalogue-version 1.1 name lualibs category Package @@ -158473,17 +158625,17 @@ name luatexja category Package -revision 48031 +revision 48341 shortdesc Typeset Japanese with Lua(La)TeX relocated 1 longdesc The package offers support for typesetting Japanese documents longdesc with LuaTeX. Either of the Plain and LaTeX2e formats may be longdesc used with the package. -containersize 188548 -containerchecksum de24440e67e249eca565a28315e8e7b27345ae97e5a66898a6dabebd06d3a166454cb1e310a586fba259c8d98f48754ecaee2c43574fbc94e3f2361eeb0e8e8a -doccontainersize 3370456 -doccontainerchecksum 6b419f18ab2e935c7f792b4a5c0afb0849fc23924aa8dd26219ab1af951cea12ce41680605107113516c22c3bcf9f93a198996a7621d922ec37aacfa8f2f34b8 -docfiles size=963 +containersize 188932 +containerchecksum 828ea28ab704bf8fffcb1d81ebcc4ec0c30641ed3c69bdf3e4af93f12d2ad6272536dc72d0afe9d434492176c49301d45f1b1ce73aa01e775e53009c4c844c9d +doccontainersize 3372304 +doccontainerchecksum b4de935e0f98a58917c6b0510194981d17b243cd72f40e7972d11dbd4eeb8cd1ad08ee744361f8db256a47e0fc5696eaf96fad6cc321157e62866d099ae8d30b +docfiles size=967 RELOC/doc/luatex/luatexja/COPYING RELOC/doc/luatex/luatexja/README details="Readme" RELOC/doc/luatex/luatexja/jfm-test.lua @@ -158501,8 +158653,8 @@ RELOC/doc/luatex/luatexja/luatexja-zhfonts.tex RELOC/doc/luatex/luatexja/luatexja.dtx RELOC/doc/luatex/luatexja/luatexja.ins -srccontainersize 83068 -srccontainerchecksum b04f0007bb786f54705aaf52aa9f694c80d25753d1e401a4c0a9f7bee24b39be039b401258ab7b5fabdb75733a05e9233b58cd2b3c21836871993104ebb4c55a +srccontainersize 83224 +srccontainerchecksum e7600cadad5218418dda0ad19ee8a843e207f6453c249176e2ff03309b39aaae028afb68fb4a0bbd2ed2ddd5e0ff05c47e5bafa94a7a206e8c3b2239d02845df srcfiles size=119 RELOC/source/luatex/luatexja/ltj-kinsoku_make.tex RELOC/source/luatex/luatexja/ltjclasses.dtx @@ -158527,10 +158679,11 @@ RELOC/source/luatex/luatexja/tool/table_ivd_aj1.lua RELOC/source/luatex/luatexja/tool/table_jisx0208.lua RELOC/source/luatex/luatexja/tool/unicodeBlocks.tex -runfiles size=431 +runfiles size=436 RELOC/tex/luatex/luatexja/addons/luatexja-adjust.sty RELOC/tex/luatex/luatexja/addons/luatexja-ajmacros.sty RELOC/tex/luatex/luatexja/addons/luatexja-fontspec-25c.sty + RELOC/tex/luatex/luatexja/addons/luatexja-fontspec-26h.sty RELOC/tex/luatex/luatexja/addons/luatexja-fontspec.sty RELOC/tex/luatex/luatexja/addons/luatexja-otf.sty RELOC/tex/luatex/luatexja/addons/luatexja-preset.sty @@ -158617,14 +158770,14 @@ RELOC/tex/luatex/luatexja/patches/lltjp-unicode-math.sty RELOC/tex/luatex/luatexja/patches/lltjp-xunicode.sty catalogue-ctan /macros/luatex/generic/luatexja -catalogue-date 2018-06-16 11:14:38 +0200 +catalogue-date 2018-08-03 06:37:38 +0200 catalogue-license bsd catalogue-topics japanese luatex class -catalogue-version 20180616.0 +catalogue-version 20180803.0 name luatexko category Package -revision 47512 +revision 48334 shortdesc Typeset Korean with Lua(La)TeX relocated 1 longdesc This is a Lua(La)TeX macro package that supports typesetting @@ -158636,11 +158789,11 @@ longdesc 2.4+ are required for this package to run. This package also longdesc requires both cjk-ko and xetexko packages for its full longdesc functionality. -containersize 23948 -containerchecksum 436fc8b4f5e8437e1ec5fec2121c33ab14b3bd32afb7ce09bfe0d63f548427712d84d4f5831196cb5255854946a1fcddd64ccaba54d82de3f9cbc0871cbd8ccf -doccontainersize 237240 -doccontainerchecksum a86fe40e6d4748a90e8f348f17eee1d6c394aa2dee2fe748611af506a119e393000bc2c97a51e5af6f4e5ef64f5929584bfcc8ccc2971d63c65f9287aefc5474 -docfiles size=66 +containersize 23912 +containerchecksum 4e6b426f7e61a09ce7b9298ce907853c5d61aec9ffeaf723b5eb405c2efd2ff9cf8b4b3a88f2068d88589fc5d6bd034716ba53834e615f101f0edae3b7a883dc +doccontainersize 237060 +doccontainerchecksum ecfffb78ac636842783de2a5aff156efac52ea8198cecc713e2fc2ee459a1c14fda37b07346a032299603bc4f8aae8de4b33f25f26db0e85719fc4c96cb838e4 +docfiles size=65 RELOC/doc/luatex/luatexko/ChangeLog RELOC/doc/luatex/luatexko/README details="Readme" RELOC/doc/luatex/luatexko/luatexko-doc.pdf details="Package documentation" @@ -158652,10 +158805,10 @@ RELOC/tex/luatex/luatexko/luatexko.lua RELOC/tex/luatex/luatexko/luatexko.sty catalogue-ctan /macros/luatex/generic/luatexko -catalogue-date 2018-04-21 09:01:22 +0200 +catalogue-date 2018-08-02 09:41:48 +0200 catalogue-license lppl1.3c catalogue-topics luatex korean -catalogue-version 1.20 +catalogue-version 1.21 name luatextra category Package @@ -161053,7 +161206,7 @@ name marginfit category Package -revision 44788 +revision 48281 shortdesc Improved margin notes relocated 1 longdesc This package fixes various bugs with the margin paragraph @@ -161061,26 +161214,26 @@ longdesc are attached to the wrong side as well as those that stick out longdesc of the bottom of the page. This package provides a drop-in longdesc replacement solution. -containersize 1872 -containerchecksum 4f325a1c0ee4e535e666cc57ec6b19554c38c967c9ca41b22bae52c78f302d4f954e6016300994f4e5588238a11a8842d61ca99b501f23379ff2e844dadd834f -doccontainersize 213316 -doccontainerchecksum 3456960c170531359c28eb97785a23abf422fca8cdf25c3c42551c03a4cf45f8e8c568ed56e4f0f3211a1a8fb19187bcae0bec900a723682e3e1210f608bdef5 -docfiles size=54 +containersize 1888 +containerchecksum a4f9a5830c02b9fa06523d16718dec7b029cb0dd8556a161cc8f38b06d4053d2c86cf0b856d8bc231ff3f4bf01fb4d6578ef245c8d9ab43d721ac4ab380d2852 +doccontainersize 215176 +doccontainerchecksum 909fb267b5eb4239ad7cf13d59d7df929a7a6687d351a0af647d0c63ec9f80500f7c034f138c4263cecea102b1f55d9b11dbbeeb4fc9ac7c877c9b167c7a1905 +docfiles size=55 RELOC/doc/latex/marginfit/Makefile RELOC/doc/latex/marginfit/README details="Readme" RELOC/doc/latex/marginfit/marginfit.pdf details="Package documentation" -srccontainersize 5632 -srccontainerchecksum 8b7ee5a4a3c755ef487d838142912d3bfe476f28a2d8d356a519ea44d392dfe421d4ab203935d05fa2a55f21602b86a3327aa8ae6539d76ae86ba53dea5f50cc +srccontainersize 5784 +srccontainerchecksum 7df7f150048c92cc63c0415615d32e53a11dbb26761f8c809558aabfa9df1dfd71f31e851c884b9b34ed82818a5b7a5527397c59d7c7d5acbefded7b998b1b88 srcfiles size=7 RELOC/source/latex/marginfit/marginfit.dtx RELOC/source/latex/marginfit/marginfit.ins runfiles size=2 RELOC/tex/latex/marginfit/marginfit.sty catalogue-ctan /macros/latex/contrib/marginfit -catalogue-date 2017-07-14 05:43:46 +0200 +catalogue-date 2018-07-26 18:47:07 +0200 catalogue-license lppl1.3 catalogue-topics marginal -catalogue-version 1.0 +catalogue-version 1.1 name marginfix category Package @@ -161119,31 +161272,31 @@ name marginnote category Package -revision 48244 +revision 48383 shortdesc Notes in the margin, even where \marginpar fails relocated 1 longdesc This package provides the command \marginnote that may be used longdesc instead of \marginpar at almost every place where \marginpar longdesc cannot be used, e.g., inside floats, footnotes, or in frames longdesc made with the framed package. -containersize 3320 -containerchecksum 0afa3f12e9798746ba2c57f003d122598ecc8e73982c7d6e1c88861842e5705e74651e7315acb20657581cdcff2b3658b572a302a7a3d77e0579d10dcbaa1a03 -doccontainersize 313144 -doccontainerchecksum 95867f9bb15c98b1294a0b0b0cd1a87f6d6c04286b5fba0ce0ee67dfd926998fcc00c0622034bb5ee9499a29ac110393eaeaac388166c23208f16fd919ac10eb -docfiles size=78 +containersize 3332 +containerchecksum 57f84fcb7859ed9107fbe14e8f09c2923b6fce844165a67ece9058cdba4bc7750e878ab8434b667be086436dc5179056b3a88c15cbcfb3e404446e8a92230fca +doccontainersize 317408 +doccontainerchecksum c4e7f12bda9f7f55e6456bcfa46ebd5cc27d8004d4a5c739a315f1fe66bb22ce61863c7f57b9ed5535c1520d19e052d0490df35c172fb01059e5070831e88779 +docfiles size=79 RELOC/doc/latex/marginnote/README.txt details="Package README" RELOC/doc/latex/marginnote/marginnote.pdf details="Package documentation" -srccontainersize 9648 -srccontainerchecksum c2aa9a1c9749bc593d7023aeed6209da420225ddac9abf33ad975e73306de3d9f35a2d1e40b22c885fba09aa8d1aa53ae51200044d20efaf3ede4bd841bd1d4a +srccontainersize 10216 +srccontainerchecksum 86b722ade866dd80db34b46e7f812676c321a0332c551eaa3745dcfdba4522dc7253f3e990efb4f757baca5977c8a983103dacd6e0fa0edd519717e18b4b6bee srcfiles size=10 RELOC/source/latex/marginnote/marginnote.dtx runfiles size=4 RELOC/tex/latex/marginnote/marginnote.sty catalogue-ctan /macros/latex/contrib/marginnote -catalogue-date 2018-07-21 14:04:01 +0200 +catalogue-date 2018-08-09 12:16:31 +0200 catalogue-license lppl1.3c catalogue-topics notes -catalogue-version 1.4a +catalogue-version 1.4b name markdown category Package @@ -162300,7 +162453,7 @@ name mathastext category Package -revision 42447 +revision 48458 shortdesc Use the text font in maths mode relocated 1 longdesc The package uses a text font (usually the document's text font) @@ -162315,26 +162468,26 @@ longdesc purposes helps produce smaller PDF files. The package, if longdesc running under LuaTeX, requires the TeX live 2013 distribution longdesc (or later). -containersize 14744 -containerchecksum 7e9f8f084ffc701e0b940005a42b29806edfcd4b9e601a2b34e83309da4cdacba21a1f28d309ae061d86cdccb9c6569e9844f836a3afaee2e9d29b60a6013e0c -doccontainersize 486912 -doccontainerchecksum b4b11450c816e79ca862ef48aebec685b21b23effda865df49eedc87578ec63cd2399d1a95b45f636fa0f743d133ff80647cf89c4d7366b02385b8b1a6db3fef -docfiles size=125 +containersize 14920 +containerchecksum f8f5fddde33008b488c788d0b6de69f6745c6e979cc94324c35e93d8f64478e7bd131f4274ba8b293d32b5dc46929451d3f04bd866df392eb759a03df2c8a505 +doccontainersize 495868 +doccontainerchecksum f60a91d7352e569190deffe4d08576e2d4a6f09f5ec0c69d444325277b64d93bc108c130beb675a0c3a2a1ff762b221d4e1a54b1f2633b765130c92b7d3eaa87 +docfiles size=129 RELOC/doc/latex/mathastext/README.md details="Readme" RELOC/doc/latex/mathastext/mathastext.pdf details="Package documentation" RELOC/doc/latex/mathastext/mathastexttestalphabets.pdf details="Output of test script" -srccontainersize 85532 -srccontainerchecksum 2b28ef4cb9f740854313bb294a4e15e6c68643ad472fb2d0647cd54ec6abcdb6cc2dc8bfa1236e02a05ca02fcd6dcd48e09329be6da1893f6dc29bc7dd029d63 -srcfiles size=86 +srccontainersize 86868 +srccontainerchecksum 47ba8441be03cbd737140630d86b32442e2005aa381373639b37172736883be26dc43cd8fb61c4cdff2db03f4d3f267fc4136b8d9ad610e57ac0bb670c8d4eea +srcfiles size=87 RELOC/source/latex/mathastext/mathastext.dtx RELOC/source/latex/mathastext/mathastext.ins -runfiles size=21 +runfiles size=22 RELOC/tex/latex/mathastext/mathastext.sty catalogue-ctan /macros/latex/contrib/mathastext -catalogue-date 2017-04-18 05:31:40 +0200 +catalogue-date 2018-08-22 20:22:54 +0200 catalogue-license lppl1.3 catalogue-topics font font-maths font-sel -catalogue-version 1.3r +catalogue-version 1.3t name mathcomp category Package @@ -163768,6 +163921,40 @@ catalogue-topics maths bugfix catalogue-version 1.0 +name mathfont +category Package +revision 48329 +shortdesc Use TrueType and OpenType fonts in math mode; compatible with XeTeX and LuaTeX +relocated 1 +longdesc The mathfont package provides a flexible interface for changing +longdesc the font of math mode characters. The package allows the user +longdesc to specify a default unicode font for each of six basic classes +longdesc of Latin and Greek characters, and it provides additional +longdesc support for unicode alphanumeric symbols. Crucially, mathfont +longdesc is compatible with both LuaLaTeX and XeLaTeX, and it provides +longdesc several font-loading commands that allow the user to change +longdesc fonts locally or for individual symbols within math mode. +containersize 5284 +containerchecksum 6111546b089f97806fd502a49244f4c30875cfd49eda5a6da2796f1eeb3abbd1e40d3938a3340d530545491c52a3591f7da7c578d9f3b05e9abe69df1229a441 +doccontainersize 238288 +doccontainerchecksum 7bedcea88cbeec54ee469586c319c87debaa6a8736c1e49aa8beca4800d17f4a9a595cf2ad5853130d1d85341cc6e2cba1c550c2c9bef35260709658eed278e8 +docfiles size=61 + RELOC/doc/latex/mathfont/README.TEXLIVE + RELOC/doc/latex/mathfont/README.txt details="Readme" + RELOC/doc/latex/mathfont/mathfont.pdf details="Package documentation" + RELOC/doc/latex/mathfont/mathfont_greek.tex +srccontainersize 16712 +srccontainerchecksum 950bfbd0765a0f0e041f64f183277fe077853decb1c5c417242705d6d3e6b8f1583302928ec7965e6e7bf04abcc3f9765e523d53acbf771b406607743f4acddf +srcfiles size=20 + RELOC/source/latex/mathfont/mathfont.dtx +runfiles size=9 + RELOC/tex/latex/mathfont/mathfont.sty +catalogue-ctan /macros/latex/contrib/mathfont +catalogue-date 2018-08-01 21:17:47 +0200 +catalogue-license lppl1.3c +catalogue-topics font-mgmt font-use maths +catalogue-version 1.2 + name mathpartir category Package revision 39864 @@ -177217,22 +177404,22 @@ name multirow category Package -revision 42588 +revision 48354 shortdesc Create tabular cells spanning multiple rows relocated 1 longdesc The package has a lot of flexibility, including an option for longdesc specifying an entry at the "natural" width of its text. The longdesc package is distributed with the bigdelim and bigstrut packages, longdesc which can be used to advantage with \multirow cells. -containersize 2580 -containerchecksum e264700374d99c98822a6b7828ec6b9d699af3c9dd08f30c70be38647a08dc6784d94b16a932ab3c974777af8f8b7d1bd81106f94d1a1978e8c4522399b7a2af -doccontainersize 608940 -doccontainerchecksum 322db432219763829de9aaf553cdb71824103716ace045713d3bb9dbd5f96e2ae98c075c1a50ba7d6cc402422d8a6add65da73ac9da8a0ca19ded627c6e8ec5a -docfiles size=150 +containersize 2592 +containerchecksum f88596d38b8f15363a02c84c68f290bf1746ad4282b6c3abcaa1655c2c4f82c0fe601ba0b46e330246eccedc6d4e9a5101ea5d773f8cae8b704bc80ebf2b1c8f +doccontainersize 612056 +doccontainerchecksum 1878f76d910accc1151dc0434cfe092871a52c835b3b0d53e40eb015b2ff26d908e1406102db917d67798b65b7f1f436066f846a899d3209d27a20cc11e7813f +docfiles size=152 RELOC/doc/latex/multirow/README details="Readme" RELOC/doc/latex/multirow/multirow.pdf details="Package documentation" -srccontainersize 18172 -srccontainerchecksum 90977ab09122d24a7031e059bd12b2fae7e36620ca642d4e9da496040129ffeb02474ffd06c10225c13e7eeac96df9e1c645abbe85fe64281cadddcb893969f0 +srccontainersize 18260 +srccontainerchecksum cc46429e51a16c057ba1152ea3e2794adb57468ec6149cbeaa2d355179aa2f06063db106c1d3c14710fb1bad8996693242dae816f0f7ceb30fb4528d8ef592e7 srcfiles size=21 RELOC/source/latex/multirow/multirow.dtx RELOC/source/latex/multirow/multirow.ins @@ -177242,10 +177429,10 @@ RELOC/tex/latex/multirow/multirow.sty catalogue-also bigstrut bigdelim catalogue-ctan /macros/latex/contrib/multirow -catalogue-date 2016-11-25 20:42:27 +0100 +catalogue-date 2018-08-05 10:35:22 +0200 catalogue-license lppl1.3 catalogue-topics table -catalogue-version 2.2 +catalogue-version 2.3 name munich category Package @@ -177352,7 +177539,7 @@ name musixtex category Package -revision 47682 +revision 48353 shortdesc Sophisticated music typesetting longdesc MusiXTeX provides a set of macros, based on the earlier longdesc MusicTeX, for typesetting music with TeX. To produce optimal @@ -177368,11 +177555,11 @@ longdesc the pmx preprocessor compiles a simpler input language to longdesc MusiXTeX macros.. depend musixtex.ARCH -containersize 99424 -containerchecksum 7e42b84e0d51e093d5bf5916943b9c25fe9ba531e01292ada7bc572fb37fc208bf8422b8cccb624008f07d93f588dab7c7a6bcd22f2b59524e47ea7b11ec713e -doccontainersize 2006124 -doccontainerchecksum 34ffdeda8159aa22099f399a167b4c662482e7983d443338be1e1321914b961f3d445939cc3a3bfeba95151ca25bf36b15b95a7b6cbe31a4ed8b7124b3e6c32f -docfiles size=1373 +containersize 100776 +containerchecksum e183ead0bf93e7d456033afff2deba0e7cac2adc13f6706f79541c7406a5c83fe185887b73f2664e965f3a3e53ed445003759dbe874447c2daa46aded9b17c5a +doccontainersize 2031868 +doccontainerchecksum c0e0c682cbf3bfd1b270e6675d04da916669840b5bc1a93311a94fa8dbf5c71c30a0fcdb46bbe098140e1a6d29f82cdc160e9e15b09384cc422d65a26e18bd36 +docfiles size=1387 texmf-dist/doc/generic/musixtex/ChangeLog-114.txt texmf-dist/doc/generic/musixtex/ChangeLog-115.txt texmf-dist/doc/generic/musixtex/ChangeLog-116.txt @@ -177388,6 +177575,7 @@ texmf-dist/doc/generic/musixtex/ChangeLog-126.txt texmf-dist/doc/generic/musixtex/ChangeLog-127.txt texmf-dist/doc/generic/musixtex/ChangeLog-128.txt + texmf-dist/doc/generic/musixtex/ChangeLog-129.txt texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt texmf-dist/doc/generic/musixtex/README details="Readme" texmf-dist/doc/generic/musixtex/examples/adagio.tex @@ -177527,14 +177715,14 @@ texmf-dist/doc/man/man1/musixtex.1 texmf-dist/doc/man/man1/musixtex.man1.pdf srccontainersize 9008 -srccontainerchecksum 8c0ac6f0507ab74d6c95466cd74a893512f5599fae14f94464a43db03352eaa10fa1b6298de9c83688749b99ed61f21a611683404613803c6b76383d7f328406 +srccontainerchecksum 329c0d1fce5506c8a12ad0c28ce658411321d99bec8e9b88275cf807ab8404cefe812bcd5c4700fbc15dceb29e0efa24419b9acef7407fbb8bcef935c8af8c1f srcfiles size=12 texmf-dist/source/generic/musixtex/musixcrd/doc.tex texmf-dist/source/generic/musixtex/musixcrd/makefile texmf-dist/source/generic/musixtex/musixcrd/musixcrd.dtx texmf-dist/source/generic/musixtex/musixcrd/readme texmf-dist/source/generic/musixtex/musixcrd/strip.tex -runfiles size=146 +runfiles size=148 texmf-dist/dvips/musixtex/psslurs.pro texmf-dist/scripts/musixtex/musixflx.lua texmf-dist/scripts/musixtex/musixtex.lua @@ -177588,10 +177776,10 @@ texmf-dist/tex/latex/musixtex/musixtex.sty catalogue-also pmx catalogue-ctan /macros/musixtex -catalogue-date 2018-05-08 05:12:57 +0200 +catalogue-date 2018-08-05 08:12:10 +0200 catalogue-license gpl2+ catalogue-topics music -catalogue-version 1.28 +catalogue-version 1.29 name musixtex-fonts category Package @@ -183040,7 +183228,7 @@ name nicematrix category Package -revision 48154 +revision 48395 shortdesc Several features to improve the typesetting of mathematical matrices with TikZ relocated 1 longdesc This package provides new environments similar to the @@ -183053,25 +183241,25 @@ longdesc obtained using \cdots, \vdots, \ddots, etc.). This package also longdesc provides a control over the width of the columns and the longdesc possibility to add an exterior line and an exterior column. -containersize 7220 -containerchecksum 54713d402afc74e83f6948cb52e6996c08f861dde9cdead4a19d63698d16c64adf236a4ed0ed2aa75ce8c5609e6c73750d5288e6c9a41e46b6d05ba5759ab627 -doccontainersize 307064 -doccontainerchecksum bb51a3a50bb1e4b78e348110783c64607bb8ca8362483f1ec240a579f058b206278b7c02ce2615393783d0edbad492be7a880f7b43def5885c2c684726f8ad79 -docfiles size=78 +containersize 7968 +containerchecksum 7701902fa7c52319ca352287bbe48d4f7f04b78f7032495d5ea20087ada77e03bfedb66f2f281fc6c11cd16c0f6f423090d7f29a1df1807c8c135ab9d2370231 +doccontainersize 361024 +doccontainerchecksum 1f4145da77adaeb1f7afa5f3f7aa119c86631e2b77d15afda616d2b1c1122998dd242c6a5d03ca92ae6aaf8318c1d7843926dd4aeba1d1daf8f7e4f2a69773b9 +docfiles size=92 RELOC/doc/latex/nicematrix/README.md details="Readme" RELOC/doc/latex/nicematrix/nicematrix.pdf details="Package documentation" -srccontainersize 24624 -srccontainerchecksum 761eb18478f494f8bb4bef18eff5e3d5faf6e935923222b1e68fafd0b9062c2a37fdcd90b4501e44458833b318ab455bd7723e38319c4c443a223c502a0fc7b1 -srcfiles size=33 +srccontainersize 28652 +srccontainerchecksum 81f0705881afd230217aeabf8440e4d17cb96285750d7d067f81c9c3f8b972e052e4b103f4e540ada3bee3e889193257d81e41a71d8f80876fcc1cf05a7cb9c0 +srcfiles size=42 RELOC/source/latex/nicematrix/nicematrix.dtx RELOC/source/latex/nicematrix/nicematrix.ins -runfiles size=12 +runfiles size=14 RELOC/tex/latex/nicematrix/nicematrix.sty catalogue-ctan /macros/latex/contrib/nicematrix -catalogue-date 2018-07-06 16:39:38 +0200 +catalogue-date 2018-08-12 14:44:13 +0200 catalogue-license lppl1.3 catalogue-topics maths pgf-tikz -catalogue-version 2.0 +catalogue-version 2.1 name nicetext category Package @@ -183164,7 +183352,7 @@ name nidanfloat category Package -revision 46906 +revision 48295 shortdesc Bottom placement option for double float in two column mode (nidan-kumi) relocated 1 longdesc This package enables a bottom placement option for double @@ -183172,23 +183360,24 @@ longdesc of the Japanese pLaTeX bundle and is now distributed as a longdesc separate package because it supports all LaTeX formats. containersize 4136 -containerchecksum 84b5970d06a78e4973218cad2333e9bfef0f09a1f9e935b4f34549e20eb95f0dae16815d5d1d84fd27b03436f0455e42c3401390e867601de3761e988a7dc167 -doccontainersize 154776 -doccontainerchecksum 30c0e76a1d0826805a9af997b8bbb4fd2334411f9f354598fcbf5e0e88a20516e2a114f06c9a4f8e685f01b59b1fc74b6268694e9bb172280b47a817da756395 -docfiles size=40 +containerchecksum ee424937c5e6433f9f103c4fb86e0a25d085b1e28233a955a689b23456fcfe16a1a6a691d5bfdf3f45e94e4f81fc217f75da5cb6fdaeb9de6c24475c03c0676e +doccontainersize 225896 +doccontainerchecksum 97b370fde5e113be6e25bd69ec4b8b03696ba472e2c2fdff34e09ef84c2722cd2d93cff12eb5b2931405ddfaf705b4059dfefb0c0709611f75f2c841ec08ca65 +docfiles size=59 RELOC/doc/latex/nidanfloat/LICENSE RELOC/doc/latex/nidanfloat/README.md details="Readme" + RELOC/doc/latex/nidanfloat/nidanfloat-en.pdf RELOC/doc/latex/nidanfloat/nidanfloat.pdf details="Package documentation (Japanese)" language="ja" -srccontainersize 9480 -srccontainerchecksum f9e73113bf9ee7e3849d118514debff7cabd26ba5dd31295dc38fdb34eb835bd8b779697f67387ce24bcbb7c9fa3bf1ba5a6682159fd9b4f2580ee6770e558b9 -srcfiles size=12 +srccontainersize 12840 +srccontainerchecksum cdffb19e02eca970460e1265ad818a5e1909c882437c88ee6bba9f6186c83ab7eb0b2f70eaf85955d0f78fe07daa013bec72b95f43b71d5cdce602f32cf94075 +srcfiles size=15 RELOC/source/latex/nidanfloat/Makefile RELOC/source/latex/nidanfloat/nidanfloat.dtx RELOC/source/latex/nidanfloat/nidanfloat.ins runfiles size=5 RELOC/tex/latex/nidanfloat/nidanfloat.sty catalogue-ctan /macros/latex/contrib/nidanfloat -catalogue-date 2018-03-09 19:17:43 +0100 +catalogue-date 2018-07-28 14:57:17 +0200 catalogue-license bsd3 catalogue-topics float japanese @@ -198988,32 +199177,32 @@ name pgf-blur category Package -revision 31693 +revision 48446 shortdesc PGF/TikZ package for "blurred" shadows relocated 1 longdesc The package adds blurred/faded/fuzzy shadows to PGF/TikZ longdesc pictures. It is configured as a TikZ/PGF library module. The longdesc method is similar to that of the author's pst-blur package for longdesc PSTricks. -containersize 2372 -containerchecksum 1889c012eb560e2e637fcbbaf1f73536c7877a11d9d47ac335c883de72f30ac6f2e6e36dd55c2add91a5b03e46073565233d44f61ba3f5cfde99113700d15cf4 -doccontainersize 246328 -doccontainerchecksum 1c6728a29b90c7c128a307df7361d5abc94ccd4be3cfcf27e871a3ffa450510dfba77a42d35ad93408d85253d48131505fb939b6720015699a7fbbe94aa2abda +containersize 2596 +containerchecksum 77bb0b5f6a176826abb39ed891e879c8ad80f2e8f1fa6b965b65fbcc22796227bd1520d1d80712034333d8de1e3eb6154fd1523bbbc575b6074e2d05c655cdd2 +doccontainersize 242488 +doccontainerchecksum c203cd71f7dc4672c1b5781161df4abebc6c6217d2a1f863ea8ac5024dfee0a4ee6cd4104aa4000f835317499fe9e887d066a3047f6e133106b08c251810a008 docfiles size=63 - RELOC/doc/latex/pgf-blur/README details="Readme" + RELOC/doc/latex/pgf-blur/README.md details="Readme" RELOC/doc/latex/pgf-blur/pgf-blur.pdf details="Package documentation" -srccontainersize 8852 -srccontainerchecksum b51196ea78bb9c670ec54ebc257e3e59bb6f26b8bdcdbfa715b9cbd80dc4d7c4a476d1aa503483d48a245f598b0ece0ffaf96ac8346da852fd5ca43f518bf526 -srcfiles size=9 +srccontainersize 9232 +srccontainerchecksum 4a89acd4916d1d24b52b2a7c53c936941d1a8c0413a311f717b1bcfe1631ae801b1440a38008cf8ff8070f805b5c4fc3f714855f33377515114705955746c967 +srcfiles size=10 RELOC/source/latex/pgf-blur/pgf-blur.dtx RELOC/source/latex/pgf-blur/pgf-blur.ins -runfiles size=2 +runfiles size=3 RELOC/tex/latex/pgf-blur/tikzlibraryshadows.blur.code.tex catalogue-ctan /graphics/pgf/contrib/pgf-blur -catalogue-date 2016-06-24 19:18:15 +0200 -catalogue-license lppl +catalogue-date 2018-08-21 14:56:15 +0200 +catalogue-license lpplpd catalogue-topics graphics-subpic pgf-tikz -catalogue-version 1.01 +catalogue-version 1.02 name pgf-soroban category Package @@ -200157,7 +200346,7 @@ name phonenumbers category Package -revision 46194 +revision 48355 shortdesc Typesetting telephone numbers with LaTeX relocated 1 longdesc The phonenumbers package makes it possible to typeset telephone @@ -200169,10 +200358,10 @@ longdesc code. The package is able to check if a phone number is valid longdesc according to the national rules. It also allows to link phone longdesc numbers using the hyperref package. -containersize 69840 -containerchecksum 5fc549e000a1e8b39913bab83ba257ff2e86bb7d5f85f50879b7f9120786260fa9f523493b93dcab5bb9dc207f9d2e36ec09c455466889c3e954e60f43ffdb37 -doccontainersize 1104028 -doccontainerchecksum 7ab8e23cccb306d63cabecfd47b3cd7455233a8c5cfaf73eacfc1716e991d33732418f6256cf03661eaf6037483f000cfb628335de2a9bf450dd1fe9366189c5 +containersize 69960 +containerchecksum 1f66ae909cc77ccdc3a01c07f4e019fecee7631db24010dfb635b54bc8676c84deaea1568232232b898f219f94a3a75e263dab7828a89ba30f68f3f3a3b55d98 +doccontainersize 1113624 +doccontainerchecksum da4ec2c324e8c46cce9f3f2f1778c03c441956cbddc6bd05be56931153e255bf628c9719b384b381ff9d3988d26a0e1712a016c203fdf398da635faf5bb5096d docfiles size=952 RELOC/doc/latex/phonenumbers/Literatur.bib RELOC/doc/latex/phonenumbers/README details="Readme" @@ -200194,10 +200383,10 @@ RELOC/tex/latex/phonenumbers/phn-US_Vorwahlen.tex RELOC/tex/latex/phonenumbers/phonenumbers.sty catalogue-ctan /macros/latex/contrib/phonenumbers -catalogue-date 2018-01-07 14:49:11 +0100 +catalogue-date 2018-08-05 12:59:26 +0200 catalogue-license lppl1.3 catalogue-topics addr-list numbers -catalogue-version 2.0.2 +catalogue-version 2.1 name phonetic category Package @@ -201970,7 +202159,7 @@ name platex category Package -revision 47782 +revision 48293 shortdesc pLaTeX2e and miscellaneous macros for pTeX longdesc The bundle provides pLaTeX2e and miscellaneous macros for pTeX longdesc and e-pTeX. This is a community edition forked from the @@ -201984,11 +202173,11 @@ depend ptex-fonts depend platex.ARCH execute AddFormat name=platex engine=eptex options="*platex.ini" patterns=language.dat fmttriggers=babel,cm,hyphen-base,latex,latex-fonts,ptex-fonts -containersize 34008 -containerchecksum 79c5163e0a8db499e9603697a9596d4124a5f6a6365a47f940893361aecd297d1b6c447155d64079f9723548211a08443c4da4c4ff56cad5bf0cc33ce611a0cb -doccontainersize 1512404 -doccontainerchecksum 40fdd790641269ea09b7e4b4a1140bbec74edce0227fc6ce87d7a64ddf917596fc6fea438c0ddc96980d75e4f191caf449b8ad4d7bc9525bf292f77287fceb0a -docfiles size=387 +containersize 34156 +containerchecksum 220819ca572ca1620a2dca4daa1df21475650d47d8aecfdf24d59c5ea8c4be5be69bd1cf60e0dbf5e29423726bb9b961869fb68933b27487c53fdfa530befe48 +doccontainersize 1519540 +doccontainerchecksum ad25b27634e0cd6039120235578fceb1610408f137889fed3228c5aefb60f073053f92f53f81a718757ab786aeb7726baeca46055e5436862b93285c2096541b +docfiles size=390 texmf-dist/doc/man/man1/platex.1 texmf-dist/doc/man/man1/platex.man1.pdf texmf-dist/doc/platex/base/Changes_asciimw.txt @@ -202001,9 +202190,9 @@ texmf-dist/doc/platex/base/platex.pdf details="Package documentation" language="ja" texmf-dist/doc/platex/base/platexrelease.pdf texmf-dist/doc/platex/base/pldoc.pdf -srccontainersize 114384 -srccontainerchecksum bc2e00932c6f8cf777925355ee6036520355627b4414524f622acdf9a0d20feff3813677c17a095587d58a191d487dc585a4e02dbe57c9ac5823caa49bffa1d0 -srcfiles size=169 +srccontainersize 116648 +srccontainerchecksum 06cf805ae34c77a25cadb5c7bf38034760d6feddd588c12f0e29246b512459267724acf4de36d5211eaf60e6b1e14734ccb6209abd8a391ad2c0ba1f54725cda +srcfiles size=173 texmf-dist/source/platex/base/Makefile texmf-dist/source/platex/base/jclasses.dtx texmf-dist/source/platex/base/jltxdoc.dtx @@ -202037,8 +202226,9 @@ texmf-dist/source/platex/base/plnewsc08.tex texmf-dist/source/platex/base/plnewsc09.tex texmf-dist/source/platex/base/plnewsc10.tex + texmf-dist/source/platex/base/plnewsc11.tex texmf-dist/source/platex/base/plvers.dtx -runfiles size=136 +runfiles size=137 texmf-dist/tex/platex/base/exppl2e.sty texmf-dist/tex/platex/base/jarticle.cls texmf-dist/tex/platex/base/jarticle.sty @@ -202082,7 +202272,7 @@ texmf-dist/tex/platex/base/tsize12.clo texmf-dist/tex/platex/config/platex.ini catalogue-ctan /language/japanese/platex -catalogue-date 2018-05-20 06:51:33 +0200 +catalogue-date 2018-07-28 12:12:27 +0200 catalogue-license bsd3 catalogue-topics format class japanese @@ -202314,6 +202504,41 @@ catalogue-topics tut-cheat catalogue-version 3.0 +name plautopatch +category Package +revision 48454 +shortdesc Automated patches for pLaTeX/upLaTeX +relocated 1 +longdesc Japanese pLaTeX/upLaTeX formats and packages often conflict +longdesc with other LaTeX packages which are unaware of pLaTeX/upLaTeX. +longdesc In the worst case, such packages throw a fatal error or end up +longdesc with a wrong output. The goal of this package is that there +longdesc should be no need to worry about such incompatibilities, +longdesc because specific patches are loaded automatically whenever +longdesc necessary. This helps not only to simplify source files, but +longdesc also to make the appearance of working pLaTeX/upLaTeX sources +longdesc similar to those of ordinary LaTeX ones. +containersize 2696 +containerchecksum dccad206c575996be6a4a7fed401d2ccc044018db13de0fb85d9b6ba65d045a5c35d5de99437ef8ef39ff1e25ac6843d628258a3da97a2b2a4e4da87da7ed5ce +doccontainersize 126724 +doccontainerchecksum 760934d736379819f90d2985ee164b5d9b7bfab82cfabcf6867ac52732a175602622e5d834cf8de328a9e13e75dea863ae2971d9f73a8a19e12acf76b91057a6 +docfiles size=39 + RELOC/doc/latex/plautopatch/LICENSE + RELOC/doc/latex/plautopatch/Makefile + RELOC/doc/latex/plautopatch/README.md details="Readme" + RELOC/doc/latex/plautopatch/plautopatch-ja.pdf details="Package documentation (Japanese)" language="ja" + RELOC/doc/latex/plautopatch/plautopatch-ja.tex + RELOC/doc/latex/plautopatch/plautopatch.pdf details="Package documentation (English)" + RELOC/doc/latex/plautopatch/plautopatch.tex +runfiles size=3 + RELOC/tex/latex/plautopatch/plautopatch.sty + RELOC/tex/latex/plautopatch/pxpdfpages.sty +catalogue-ctan /language/japanese/plautopatch +catalogue-date 2018-08-22 19:09:46 +0200 +catalogue-license bsd3 +catalogue-topics japanese debug-supp bugfix +catalogue-version 0.3 + name play category Package revision 15878 @@ -202687,7 +202912,7 @@ name plex category Package -revision 47147 +revision 48332 shortdesc Support for IBM Plex fonts relocated 1 longdesc The package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX @@ -202696,22 +202921,28 @@ longdesc ExtraLight, Thin, Bold, Text, Medium and SemiBold (with longdesc corresponding italics). execute addMap plex.map -containersize 9968752 -containerchecksum 3f706d811a0c4e6fc0ff4cec9dc86b1d5ce31e2fa843e919991a44fc142bf8bcb6eb0113dad514b862ca4f255e86cc662e3a0dfc3aac37154256111b658e4559 -doccontainersize 64624 -doccontainerchecksum 3b22c9626ecd9348cabd2c3c9b72c7b77810e7abcba52ccbdbc1238061597de1038e0a6648174bdcd4d44c6b75fc2e70d6a32b6a68e631e8e699f50273b2fc02 +containersize 10214516 +containerchecksum 8e75431f50208845833b5801b6ad57a404d0c12a8f8ac236dfca294c8ceb54adc9e87417c49ddac6037cd6bac22fd08350e331bebafb6c04667f8ba2e7939e9d +doccontainersize 64628 +doccontainerchecksum 7589ffa741bd047e62d04b45c0e9a89fb096813001baa2390062ead05cdd3ecf7e175f6f2e858e59c49015a3e32e3277fa80a7b1f348e4c1c63969b28e3676c7 docfiles size=20 RELOC/doc/fonts/plex/LICENSE.txt RELOC/doc/fonts/plex/README details="Readme" RELOC/doc/fonts/plex/plex-samples.pdf details="Samples" RELOC/doc/fonts/plex/plex-samples.tex -runfiles size=5633 +runfiles size=5781 RELOC/fonts/enc/dvips/plex/plx_3iickh.enc RELOC/fonts/enc/dvips/plex/plx_6tuc4c.enc RELOC/fonts/enc/dvips/plex/plx_ankagf.enc + RELOC/fonts/enc/dvips/plex/plx_be3ach.enc RELOC/fonts/enc/dvips/plex/plx_dqgnwu.enc + RELOC/fonts/enc/dvips/plex/plx_eofykt.enc RELOC/fonts/enc/dvips/plex/plx_errukl.enc RELOC/fonts/enc/dvips/plex/plx_i5ra6t.enc + RELOC/fonts/enc/dvips/plex/plx_its57d.enc + RELOC/fonts/enc/dvips/plex/plx_jmvqu6.enc + RELOC/fonts/enc/dvips/plex/plx_m2a4iq.enc + RELOC/fonts/enc/dvips/plex/plx_mlp3up.enc RELOC/fonts/enc/dvips/plex/plx_nhokty.enc RELOC/fonts/enc/dvips/plex/plx_ojqnwd.enc RELOC/fonts/enc/dvips/plex/plx_oqvkyq.enc @@ -202721,6 +202952,7 @@ RELOC/fonts/enc/dvips/plex/plx_toaz2j.enc RELOC/fonts/enc/dvips/plex/plx_wvtw5j.enc RELOC/fonts/enc/dvips/plex/plx_xl2q4z.enc + RELOC/fonts/enc/dvips/plex/plx_y64dew.enc RELOC/fonts/map/dvips/plex/plex.map RELOC/fonts/opentype/ibm/plex/IBMPlexMono-Bold.otf RELOC/fonts/opentype/ibm/plex/IBMPlexMono-BoldItalic.otf @@ -203563,13 +203795,13 @@ RELOC/fonts/type1/ibm/plex/IBMPlexMono-LightItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-Medium.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-MediumItalic.pfb + RELOC/fonts/type1/ibm/plex/IBMPlexMono-Regular.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-SemiBold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-SemiBoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-Text.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-TextItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-Thin.pfb RELOC/fonts/type1/ibm/plex/IBMPlexMono-ThinItalic.pfb - RELOC/fonts/type1/ibm/plex/IBMPlexMono.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-Bold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-BoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-ExtraLight.pfb @@ -203579,13 +203811,13 @@ RELOC/fonts/type1/ibm/plex/IBMPlexSans-LightItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-Medium.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-MediumItalic.pfb + RELOC/fonts/type1/ibm/plex/IBMPlexSans-Regular.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-SemiBold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-SemiBoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-Text.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-TextItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-Thin.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSans-ThinItalic.pfb - RELOC/fonts/type1/ibm/plex/IBMPlexSans.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-Bold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-BoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-ExtraLight.pfb @@ -203595,13 +203827,13 @@ RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-LightItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-Medium.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-MediumItalic.pfb + RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-Regular.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-SemiBold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-SemiBoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-Text.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-TextItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-Thin.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSansCond-ThinItalic.pfb - RELOC/fonts/type1/ibm/plex/IBMPlexSansCond.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-Bold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-BoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-ExtraLight.pfb @@ -203611,13 +203843,13 @@ RELOC/fonts/type1/ibm/plex/IBMPlexSerif-LightItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-Medium.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-MediumItalic.pfb + RELOC/fonts/type1/ibm/plex/IBMPlexSerif-Regular.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-SemiBold.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-SemiBoldItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-Text.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-TextItalic.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-Thin.pfb RELOC/fonts/type1/ibm/plex/IBMPlexSerif-ThinItalic.pfb - RELOC/fonts/type1/ibm/plex/IBMPlexSerif.pfb RELOC/fonts/vf/ibm/plex/IBMPlexMono-Bold-sup-ly1.vf RELOC/fonts/vf/ibm/plex/IBMPlexMono-Bold-sup-t1.vf RELOC/fonts/vf/ibm/plex/IBMPlexMono-Bold-tlf-ly1.vf @@ -203970,7 +204202,7 @@ RELOC/tex/latex/plex/plex-sans.sty RELOC/tex/latex/plex/plex-serif.sty catalogue-ctan /fonts/plex -catalogue-date 2018-03-27 05:36:27 +0200 +catalogue-date 2018-08-02 05:09:00 +0200 catalogue-license ofl catalogue-topics font font-type1 font-otf font-t1enc font-mono font-sans @@ -207450,42 +207682,48 @@ name proofread category Package -revision 43370 +revision 48322 shortdesc Commands for inserting annotations relocated 1 -longdesc The proofread package defines a few LaTeX commands that are -longdesc useful when you proofread a LaTeX document. These allow you to -longdesc easily highlight text and add comments in the margin. Vim -longdesc escape sequences are provided for inserting these LaTeX -longdesc commands in the source. The package is based on code for a text -longdesc highlighting command that was published by Antal S-Z in -longdesc href='http://tex.stackexchange.com/questions/5959'. The main -longdesc file, proofread.dtx, is self-extracting, so you can generate -longdesc the style file by compiling proofread.dtx with pdfLaTeX. -containersize 2484 -containerchecksum add70d9855b58c3093f8d7af64ca5e055aa6195b6329824b435895af85a3db6a7d1624733431ff3c93bc32914ec156f28d4ebd689d3d36b201bb60fcf60d8112 -doccontainersize 325532 -doccontainerchecksum 500ee62597b292b900f9899ff0aeb27bdab8495ba5939fd682945ec07f990e81f7164be750fdf3345c272faeda753230cc4b7e481a8722168569d063a67631aa -docfiles size=93 +longdesc This package defines a few LaTeX commands that may be useful +longdesc when you proofread a LaTeX document. They allow you to easily +longdesc highlight text and add comments in the margin. Vim escape +longdesc sequences are provided for inserting or removing these LaTeX +longdesc commands in the source. Options are provided for displaying the +longdesc document with extra line spacing, and for displaying it in +longdesc either corrected or uncorrected state, both without margin +longdesc notes. The package is based on code for a text highlighting +longdesc command that was published by Antal Spector-Zabusky on +longdesc http://tex.stackexchange.com/questions/5959. The main file, +longdesc proofread.dtx, is self-extracting, so you can generate the +longdesc style file by compiling proofread.dtx with pdfLaTeX. This +longdesc package is based on the soul package; so if you plan to +longdesc highlight non-ASCII characters, you must compile your source +longdesc with either XeTeX- or LuaTeX-based compilers. +containersize 2620 +containerchecksum f61a9098f16faafae4ad258f48dbd6a5a440a51b552d8e76df30f37f93c1120f6f78f04743253f4434188b615c37a7f413affee104889d943ad1d84814a27e5f +doccontainersize 288048 +doccontainerchecksum e11a34099718ea93293dcb1a3e1785ae61104862f42c90e5d3cf2c4293413d6d76ae16704ec3bf2077b740f10d86ea1016a0272bee57cc1ba105344cf221514d +docfiles size=84 RELOC/doc/latex/proofread/README details="Readme" RELOC/doc/latex/proofread/README.txt - RELOC/doc/latex/proofread/example.pdf + RELOC/doc/latex/proofread/example.pdf details="Example of use" RELOC/doc/latex/proofread/example.tex RELOC/doc/latex/proofread/proofread.hd RELOC/doc/latex/proofread/proofread.pdf details="Package documentation" RELOC/doc/latex/proofread/proofread.vmb -srccontainersize 6204 -srccontainerchecksum 5bd063cf00974d4eea5765b3b90c32e7fcee6f1190c9dd29bad6f0dd94fddf36cb73dc439059a32f2506aa2488a6020d1ebdcf8f3dc88117fc25ee2a48675321 +srccontainersize 6316 +srccontainerchecksum e59deeb8fc52c9d84d2fcf34c3bec889f5b0f7a94979b64c35d126db34ec2ee1a117cb3ef26096acfea926290c22ec3f5eff78b47929cddaaf5eb1ae068ea28c srcfiles size=6 RELOC/source/latex/proofread/proofread.dtx RELOC/source/latex/proofread/proofread.ins runfiles size=2 RELOC/tex/latex/proofread/proofread.sty catalogue-ctan /macros/latex/contrib/proofread -catalogue-date 2017-02-28 22:55:12 +0100 -catalogue-license lppl1.3 -catalogue-topics editorial -catalogue-version 1.02 +catalogue-date 2018-07-31 13:24:40 +0200 +catalogue-license lppl1.3c +catalogue-topics editorial decoration +catalogue-version 1.03 name prooftrees category Package @@ -211181,16 +211419,16 @@ name pst-poker category Package -revision 45117 +revision 48347 shortdesc Drawing poker cards relocated 1 longdesc This PSTricks related package can create poker cards in various longdesc manners. -containersize 347520 -containerchecksum 315edc745ec732af683267af3723a4c8059fe2248d9b6483ebcf653c1baae1aa5220a9d6c0776d6d21fe8bc333c495c5778204b65a20565ecc48cb634782c172 -doccontainersize 2443744 -doccontainerchecksum fca1eded64c2675f377cc0c1f543b8dc69d76281c1026e07edd0381d28c0c8f6160d7dfa60613c2db02a6bd5a5c9a93a5b71acef457e4560256e605d21febf3b -docfiles size=609 +containersize 347540 +containerchecksum 893265f9a0dea9a4a473de5480be0592b6acd528fa2ce605e7a21051305b934188e49fe16cb6c71484e73e256035a28c6fa4fc90884686580a9bd398282e3f5d +doccontainersize 2449924 +doccontainerchecksum 6adbb5f467e5bb98ecd708c85f4a2d3f20d385d0ec0795a823b326c2dc33f1a74b1ff388f22f77a4b426f22404dd7a0f5fbf6b6258075816b6422cc4adc45da7 +docfiles size=611 RELOC/doc/latex/pst-poker/Changes RELOC/doc/latex/pst-poker/README details="Readme" RELOC/doc/latex/pst-poker/pst-poker-doc.bib @@ -211223,10 +211461,10 @@ RELOC/tex/latex/pst-poker/Queen-spade-color.eps RELOC/tex/latex/pst-poker/pst-poker.sty catalogue-ctan /graphics/pstricks/contrib/pst-poker -catalogue-date 2017-08-23 12:36:31 +0200 +catalogue-date 2018-08-03 21:43:01 +0200 catalogue-license lgpl3 catalogue-topics pstricks games -catalogue-version 0.02 +catalogue-version 0.03 name pst-poly category Package @@ -213317,16 +213555,16 @@ name ptex-base category Package -revision 45140 +revision 48432 shortdesc Plain TeX format and documents for pTeX and e-pTeX relocated 1 longdesc The bundle contains plain TeX format and documents for pTeX and longdesc e-pTeX. -containersize 9996 -containerchecksum 850c563b7821680e990e6c4e90718a61b6ba3d36806434e56f7b4a74990c6b9cbfb7f913fed6d741201a7827b63eb9c698ff25ef808671d61061c3cc42e0a74d -doccontainersize 1518408 -doccontainerchecksum 2583704a9dd651f765919f6a83eb07f3979c6a0cf8e3fd07e77e57b6472bb78dedc859cbba616f16292cfcd10651ea08400fd2b45b926ad2049a3119c31190f7 -docfiles size=440 +containersize 10016 +containerchecksum 6a9decc4358d1941c8de10655352cf53f3bdc7c1253205c801dd946ba50211fa92bf32ef554198b531301db9330a714d8a54200d33d0b8e2c76331dc1e1c473e +doccontainersize 2006068 +doccontainerchecksum 92cb2f517c5f866aa2b07b0a58f0b0c4546067224f72c7f376c675d712f1b22abeffc0d3243de40f52f7bb7b2e890797ad8c2d1274e995e250f5f8fc80f185fd +docfiles size=573 RELOC/doc/ptex/ptex-base/Changelog_eptex_beforeTL RELOC/doc/ptex/ptex-base/Changelog_ptex RELOC/doc/ptex/ptex-base/LICENSE @@ -213341,14 +213579,14 @@ RELOC/doc/ptex/ptex-base/fam256p.tex RELOC/doc/ptex/ptex-base/jfm.pdf RELOC/doc/ptex/ptex-base/jfm.tex - RELOC/doc/ptex/ptex-base/jtex.pdf - RELOC/doc/ptex/ptex-base/jtex.tex - RELOC/doc/ptex/ptex-base/jtexdoc.pdf - RELOC/doc/ptex/ptex-base/jtexdoc.tex - RELOC/doc/ptex/ptex-base/ptexdoc.pdf - RELOC/doc/ptex/ptex-base/ptexdoc.tex - RELOC/doc/ptex/ptex-base/ptexskip.pdf - RELOC/doc/ptex/ptex-base/ptexskip.tex + RELOC/doc/ptex/ptex-base/jtex_asciimw.pdf + RELOC/doc/ptex/ptex-base/jtex_asciimw.tex + RELOC/doc/ptex/ptex-base/jtexdoc_asciimw.pdf + RELOC/doc/ptex/ptex-base/jtexdoc_asciimw.tex + RELOC/doc/ptex/ptex-base/ptexdoc_asciimw.pdf + RELOC/doc/ptex/ptex-base/ptexdoc_asciimw.tex + RELOC/doc/ptex/ptex-base/ptexskip_asciimw.pdf + RELOC/doc/ptex/ptex-base/ptexskip_asciimw.tex runfiles size=14 RELOC/tex/ptex/ptex-base/ascii-jplain.tex RELOC/tex/ptex/ptex-base/eptex.ini @@ -213358,7 +213596,7 @@ RELOC/tex/ptex/ptex-base/ptex.ini RELOC/tex/ptex/ptex-base/ptex.tex catalogue-ctan /language/japanese/ptex-base -catalogue-date 2017-08-27 06:47:00 +0200 +catalogue-date 2018-08-18 19:11:23 +0200 catalogue-license bsd3 catalogue-topics format japanese @@ -215162,7 +215400,7 @@ name pxrubrica category Package -revision 45854 +revision 48421 shortdesc Ruby annotations according to JIS X 4051 relocated 1 longdesc This package provides a function to add ruby annotations @@ -215172,11 +215410,11 @@ longdesc JIS X 4051. Starting with version 1.3, this package also longdesc provides a function to add kenten (emphasis marks) to Japanese longdesc text. -containersize 13644 -containerchecksum b5763d108d7e159fa3c511bd3d9bcf5943a6ceaed8119fa50d54132ef6b56130a7cd355c4403e1f7739728a41912a07e01d483790943a6c661805318b86d34fe -doccontainersize 779704 -doccontainerchecksum 0ed9bf7c86408021ae5836960fd920fcf44cad40194862ed30084003a4a1c65919ea88bc01a635d2fd1f3cfc07191457d75be141ac7fa5f9d08868088853ec8b -docfiles size=217 +containersize 13660 +containerchecksum 99aab9f5c901a15ba94af980b616103ceb4d23088cbcbe80735be8801da5e8cb66a4680b5bd9a651b549d0265940253744af7b2606b8e77ae22646fb8fee60dc +doccontainersize 788380 +doccontainerchecksum 3fa05873688cba369f39db11a609975297b1da088f3abfe7d33184e9e1eeb13d5490c3c6294d7c6ac6a3da4970a8f99fc25bed71d75f13e7c529241773379d61 +docfiles size=219 RELOC/doc/platex/pxrubrica/LICENSE RELOC/doc/platex/pxrubrica/README-ja.md details="Readme" language="ja" RELOC/doc/platex/pxrubrica/README.md details="Readme" language="en" @@ -215191,18 +215429,18 @@ RELOC/doc/platex/pxrubrica/sample/test-sf.tex RELOC/doc/platex/pxrubrica/sample/test-toc.pdf RELOC/doc/platex/pxrubrica/sample/test-toc.tex -srccontainersize 37876 -srccontainerchecksum d9b3a191f9c4e28b41472d445f8af67e097ae382209e7a71c843c8ac3bf4167f5d49a1ec6593c734207dcc7c71ed22786a47d66876bb0992af0642caa7a16fa9 +srccontainersize 38392 +srccontainerchecksum bccb7d1e6cec7afea3a3c348fbd07d705b391f387205c7548a320846867572d5a3c8d1f6c14888109a74b449a12929d22f40b18917e06659833c1cf56fff90d9 srcfiles size=53 RELOC/source/platex/pxrubrica/pxrubrica.dtx RELOC/source/platex/pxrubrica/pxrubrica.ins runfiles size=20 RELOC/tex/platex/pxrubrica/pxrubrica.sty catalogue-ctan /language/japanese/pxrubrica -catalogue-date 2017-11-19 09:45:42 +0100 +catalogue-date 2018-08-16 22:17:52 +0200 catalogue-license mit catalogue-topics japanese std-conform -catalogue-version 1.3b +catalogue-version 1.3c name pxtatescale category Package @@ -216173,26 +216411,26 @@ name qcircuit category Package -revision 42816 +revision 48400 shortdesc Macros to generate quantum ciruits relocated 1 longdesc The package supports those within the quantum information longdesc community who typeset quantum circuits, using xy-pic package, longdesc offering macros designed to help users generate circuits. -containersize 4200 -containerchecksum 46f02352fb448578eefada5f802ef8300ddc9c252fde727aabb3b80ba784170dad2c3854d67467e2b7a322d4623ca05c9115bb5f4c4bf327d610b78f171cd263 -doccontainersize 295476 -doccontainerchecksum d53639c41d5959d021fda11c8c3b99323d4d1accabf67a8148c814c28ff654032a16a66ddf08b961894c3350e99411a7825397456b406cd6eea9b9b468e54ecf -docfiles size=74 +containersize 4416 +containerchecksum ba0805d50d970da6bd4db8cd930533104d670fac94ca33e5f37dbe1770b8282e1715ed836e555629ab227002890a2726999bc58e8e80452fe2d074aca95175f6 +doccontainersize 298340 +doccontainerchecksum 8a40c56ff87e61a975364f0213be6c6d106763a20eba511271e49c8c182c5bd0be403aed72562ca586844c9790312c25008266662c81194b24ece8ac924f29df +docfiles size=75 RELOC/doc/latex/qcircuit/README.md details="Readme" RELOC/doc/latex/qcircuit/qcircuit.pdf details="Package documentation" runfiles size=4 RELOC/tex/latex/qcircuit/qcircuit.sty catalogue-ctan /graphics/qcircuit -catalogue-date 2017-04-18 05:31:40 +0200 +catalogue-date 2018-08-14 19:25:41 +0200 catalogue-license gpl2 catalogue-topics diagram-circ graphics-in-tex -catalogue-version 2.5.3 +catalogue-version 2.6.0 name qcm category Package @@ -218523,7 +218761,7 @@ name register category Package -revision 47773 +revision 48433 shortdesc Typeset programmable elements in digital hardware (registers) relocated 1 longdesc This package is designed for typesetting the programmable @@ -218536,27 +218774,27 @@ longdesc float package. A Perl module and a Perl script are provided, to longdesc translate the register specifications into programmable data longdesc structures. -containersize 4036 -containerchecksum 742dccae44ee30fb21431f33b0640a7097c86df8dd1affdfedffae8a7da0e24b0234acf2ccb8d22026a4adc57209013d230eb63986e97e209eb76633f1679b14 -doccontainersize 301324 -doccontainerchecksum 6cae1461839ecd60cd634701bf64a5e9facb886ebddf1c8f3212d6d2168a66b79676da52fa5c0a4fbdd19cc42f12c82cb0f16c3553a21882563d213fdb41f790 -docfiles size=79 +containersize 4384 +containerchecksum 567fb67e37c2e6a7cf830e91d91f08d3893a76d655d53c0c3781f2aa444b222e7894b789dd0b7b41d123c1c6fd99f7c37fe4a56ed4339d4a04bdb2fb1e48c8de +doccontainersize 309028 +doccontainerchecksum f5fb07469a0b1d01053747d01f7230e96e0b4f55e78d310132594037515071ebbcd1474df67c60022af2ce098e9317e1369e5269479b685e36f677bb3df37da0 +docfiles size=81 RELOC/doc/latex/register/README details="Readme" RELOC/doc/latex/register/Reg_macro.pm RELOC/doc/latex/register/reg_list.pl RELOC/doc/latex/register/register.pdf details="Package documentation" -srccontainersize 13248 -srccontainerchecksum 4935bee8c2afac50a37bff9aa69102da3e1f92a7d59bd12bbd8656324605c7cc4cbc23538863d3c2f48752de114457addea7dcaf367c78148996dc26ec1ba731 -srcfiles size=12 +srccontainersize 14216 +srccontainerchecksum 105b3ab704a23b9a2cfe6f1bb986b4401f103fe792630f32d2d623643bf06e5f624bd323fd93e727284d59029774dddcb18d0cd3ae5777d35ddfde57b503eb20 +srcfiles size=14 RELOC/source/latex/register/register.dtx RELOC/source/latex/register/register.ins -runfiles size=3 +runfiles size=4 RELOC/tex/latex/register/register.sty catalogue-ctan /macros/latex/contrib/register -catalogue-date 2018-05-19 20:17:09 +0200 +catalogue-date 2018-08-18 19:24:10 +0200 catalogue-license lppl1.3 catalogue-topics engineering comp-sci comp-net -catalogue-version 1.6.1 +catalogue-version 1.7 name regstats category Package @@ -218987,6 +219225,35 @@ catalogue-license pd catalogue-topics cv plain-ext +name returntogrid +category Package +revision 48459 +shortdesc Semi-automatic grid typesetting +relocated 1 +longdesc returntogrid offers a few commands to get something like an +longdesc simple, semi-automatic grid typesetting. It does more or less +longdesc what the existing gridset package does. The main differences to +longdesc gridset are that returntogrid works also with LuaLaTeX and that +longdesc it has also a command to do some horizontal movements to get to +longdesc "tab" positions. +containersize 3656 +containerchecksum 8ab2482df26eb4d09f1a9a8a0ea9870b0da6f85c319766ac0bd03aa54beec3a273d0d6085b1c3807d0cba74398aaea00e6f87742110d07056e245195450d7fd2 +doccontainersize 149108 +doccontainerchecksum 0026ead88eb88b55ade496b599d340b55bafdb9956e03e5d91d79ee7e4013f551e2ee027f5199b7ca9a1ac83e5a7fecf67b94b863c1adad7fa219e927be7ff0e +docfiles size=43 + RELOC/doc/latex/returntogrid/README.md details="Readme" + RELOC/doc/latex/returntogrid/returntogrid.lua + RELOC/doc/latex/returntogrid/returntogrid.pdf details="Package documentation" + RELOC/doc/latex/returntogrid/returntogrid.tex +runfiles size=3 + RELOC/tex/latex/returntogrid/returntogrid.sty +catalogue-also grid gridset +catalogue-ctan /macros/latex/contrib/returntogrid +catalogue-date 2018-08-22 09:57:48 +0200 +catalogue-license lppl1.3c +catalogue-topics typeset-grid +catalogue-version 0.2 + name reverxii category Package revision 24976 @@ -223281,20 +223548,23 @@ name sapthesis category Package -revision 39014 +revision 48365 shortdesc Typeset theses for Sapienza-University, Rome relocated 1 longdesc The class will typeset Ph.D., Master, and Bachelor theses that longdesc adhere to the publishing guidelines of the Sapienza-University longdesc of Rome. -containersize 46432 -containerchecksum 796207c467ad935dca880b1da55493bedb19e0e60a22b51791f3bbb45dda57980d20ad25949d6a59a19b9e78569b731defb9dbcfb0d4eccaa9376c87b781745c -doccontainersize 197020 -doccontainerchecksum 6527bdf3d10998bc867927ea9b2ccbe7d1beb5fa32f13873ad48eb066b2d68bbfc5f08275233aae90ccf186a78a571a38a956d59554a542ae52e426da82a2db6 -docfiles size=85 +containersize 46656 +containerchecksum 058a6dce540acd4201b84e61e7ae6db8066bf25c2fcec082b4bb3e7776514f4dd02207ee70b1ae9b8182caf45bbc4c273b94f97be81fedf8224e5ce0b3fd5d72 +doccontainersize 203484 +doccontainerchecksum fb7eae2616f424de6fe82a29a90dd5b0f57f652b8533e7a047c97b2bb8fec901951a95c8c0c44d735440f11d2fec4723a1a1d8a0665647888f94efd33140a784 +docfiles size=95 RELOC/doc/latex/sapthesis/README details="Readme" RELOC/doc/latex/sapthesis/examples/Laurea.tex RELOC/doc/latex/sapthesis/examples/LaureaMagistrale.tex + RELOC/doc/latex/sapthesis/examples/LaureaMagistrale_eng.tex + RELOC/doc/latex/sapthesis/examples/LaureaMagistrale_ita.tex + RELOC/doc/latex/sapthesis/examples/Laurea_ita.tex RELOC/doc/latex/sapthesis/examples/Master.tex RELOC/doc/latex/sapthesis/examples/PhD.tex RELOC/doc/latex/sapthesis/examples/Specialization.tex @@ -223302,16 +223572,16 @@ RELOC/doc/latex/sapthesis/sapthesis-doc.pdf details="Package documentation" RELOC/doc/latex/sapthesis/sapthesis-doc.tex RELOC/doc/latex/sapthesis/sapthesis.layout -runfiles size=29 +runfiles size=30 RELOC/bibtex/bst/sapthesis/sapthesis.bst RELOC/tex/latex/sapthesis/sapienza-MLblack-pos.pdf RELOC/tex/latex/sapthesis/sapienza-MLred-pos.pdf RELOC/tex/latex/sapthesis/sapthesis.cls catalogue-ctan /macros/latex/contrib/sapthesis -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-07 08:46:21 +0200 catalogue-license lppl1.3 catalogue-topics dissertation -catalogue-version 3.8 +catalogue-version 4.1 name sasnrdisplay category Package @@ -224112,7 +224382,7 @@ name schule category Package -revision 37277 +revision 48471 shortdesc Support for teachers at German schools relocated 1 longdesc The 'schule' bundle was built to provide packages and commands @@ -224126,73 +224396,157 @@ longdesc and class diagrams) as well as classes for written exams longdesc (tests, quizzes, teaching observations, information sheets, longdesc worksheets, and answer keys). -containersize 14064 -containerchecksum b39c7b87ab33e5b70bd23516e15d6471afaa909b710535f99bb0137cab144613c96c34ec7cbebb744385f7056472655d66d8ec4480d231222b3b50512ebb22df -doccontainersize 1887140 -doccontainerchecksum db7ea6ca2861a576912e6229fa0c6b6d70d5bac886df3444028ef9b43ef539cbaf0f5562a980d45c23e1a26186dd4ad2f0d1879970a3c84896656bf1594a281b -docfiles size=807 - RELOC/doc/latex/schule/README details="Readme" - RELOC/doc/latex/schule/README_DE details="Readme (German)" language="de" - RELOC/doc/latex/schule/doc/abFahrplan.pdf - RELOC/doc/latex/schule/doc/abFahrplan.tex - RELOC/doc/latex/schule/doc/abbott.pdf - RELOC/doc/latex/schule/doc/abbott.tex - RELOC/doc/latex/schule/doc/abstandThread.pdf - RELOC/doc/latex/schule/doc/abstandThread.tex - RELOC/doc/latex/schule/doc/etc.tex - RELOC/doc/latex/schule/doc/nandGatter.pdf - RELOC/doc/latex/schule/doc/nandGatter.tex - RELOC/doc/latex/schule/doc/schaltplan.pdf - RELOC/doc/latex/schule/doc/schaltplan.tex - RELOC/doc/latex/schule/doc/schule-abFahrplan.pdf - RELOC/doc/latex/schule/doc/schule-abFahrplan.tex - RELOC/doc/latex/schule/doc/schule-abbott.pdf - RELOC/doc/latex/schule/doc/schule-abbott.tex - RELOC/doc/latex/schule/doc/schule-abstandThread.pdf - RELOC/doc/latex/schule/doc/schule-abstandThread.tex - RELOC/doc/latex/schule/doc/schule-nandGatter.pdf - RELOC/doc/latex/schule/doc/schule-nandGatter.tex - RELOC/doc/latex/schule/doc/schule-schaltplan.pdf - RELOC/doc/latex/schule/doc/schule-schaltplan.tex - RELOC/doc/latex/schule/doc/schule-schuleit-aufgaben-crop.pdf - RELOC/doc/latex/schule/doc/schule-schuleit-aufgaben.pdf - RELOC/doc/latex/schule/doc/schule-schuleit-aufgaben.tex - RELOC/doc/latex/schule/doc/schule-skalierungSequenzdiagramm.pdf - RELOC/doc/latex/schule/doc/schule-skalierungSequenzdiagramm.tex - RELOC/doc/latex/schule/doc/schule-syntaxPython.pdf - RELOC/doc/latex/schule/doc/schule-syntaxPython.tex - RELOC/doc/latex/schule/doc/schule-telefonnummern.pdf - RELOC/doc/latex/schule/doc/schule-telefonnummern.tex - RELOC/doc/latex/schule/doc/schule-ub.pdf - RELOC/doc/latex/schule/doc/schule-ub.tex - RELOC/doc/latex/schule/doc/schule-ubSource.pdf - RELOC/doc/latex/schule/doc/schule-ubSource.tex - RELOC/doc/latex/schule/doc/schule-vorlage.tex - RELOC/doc/latex/schule/doc/schule-wasIstInformatik.pdf - RELOC/doc/latex/schule/doc/schule-wasIstInformatik.tex - RELOC/doc/latex/schule/doc/skalierungSequenzdiagramm.pdf - RELOC/doc/latex/schule/doc/skalierungSequenzdiagramm.tex - RELOC/doc/latex/schule/doc/syntaxPython.pdf - RELOC/doc/latex/schule/doc/syntaxPython.tex - RELOC/doc/latex/schule/doc/telefonnummern.pdf - RELOC/doc/latex/schule/doc/telefonnummern.tex - RELOC/doc/latex/schule/doc/ub.pdf - RELOC/doc/latex/schule/doc/ub.tex - RELOC/doc/latex/schule/doc/ubSource.pdf - RELOC/doc/latex/schule/doc/ubSource.tex - RELOC/doc/latex/schule/doc/vorlage.tex - RELOC/doc/latex/schule/doc/wasIstInformatik.pdf - RELOC/doc/latex/schule/doc/wasIstInformatik.tex +containersize 1958868 +containerchecksum fa7bd660a2b3bbbd35d00eb93dca6830ae9aa5abe8e3a1a2ba358ef296e17d8d6d99cde09258b78fd870b77f9967b372e5a5d9b4719e20daa778cc1b18149840 +doccontainersize 4411800 +doccontainerchecksum 0c01fd17b4be2a227c5c8fa98857b11083a91fea5ea8a76c6e1b7f361d4df678783948409e444684683a82ef939d7fad80eb6bf1830da3a093176ea2bbcbfbb6 +docfiles size=2550 + RELOC/doc/latex/schule/Abbildungen/table02600-026FF.pdf + RELOC/doc/latex/schule/Abbildungen/table02600-026FF.tex + RELOC/doc/latex/schule/Abbildungen/table02700-027BF.pdf + RELOC/doc/latex/schule/Abbildungen/table02700-027BF.tex + RELOC/doc/latex/schule/Abbildungen/table1F000-1F02F.pdf + RELOC/doc/latex/schule/Abbildungen/table1F000-1F02F.tex + RELOC/doc/latex/schule/Abbildungen/table1F030-1F09F.pdf + RELOC/doc/latex/schule/Abbildungen/table1F030-1F09F.tex + RELOC/doc/latex/schule/Abbildungen/table1F0A0-1F0FF.pdf + RELOC/doc/latex/schule/Abbildungen/table1F0A0-1F0FF.tex + RELOC/doc/latex/schule/Abbildungen/table1F300-1F5FF.pdf + RELOC/doc/latex/schule/Abbildungen/table1F300-1F5FF.tex + RELOC/doc/latex/schule/Abbildungen/table1F600-1F64F.pdf + RELOC/doc/latex/schule/Abbildungen/table1F600-1F64F.tex + RELOC/doc/latex/schule/Abbildungen/table1F680-1F6FF.pdf + RELOC/doc/latex/schule/Abbildungen/table1F680-1F6FF.tex + RELOC/doc/latex/schule/Beispiele/aufgabe-1.pdf + RELOC/doc/latex/schule/Beispiele/aufgabe-2.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-ab-abbott.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-ab-abbott.tex + RELOC/doc/latex/schule/Beispiele/beispiel-ab-schiefeebene.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-ab-schiefeebene.tex + RELOC/doc/latex/schule/Beispiele/beispiel-ab.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-ab.tex + RELOC/doc/latex/schule/Beispiele/beispiel-aufgabentemplates.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-aufgabentemplates.tex + RELOC/doc/latex/schule/Beispiele/beispiel-ib-hieroglyphen.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-ib-hieroglyphen.tex + RELOC/doc/latex/schule/Beispiele/beispiel-kl.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-kl.tex + RELOC/doc/latex/schule/Beispiele/beispiel-leitprogramm.pdf + RELOC/doc/latex/schule/Beispiele/beispiel-leitprogramm.tex + RELOC/doc/latex/schule/Beispiele/bsp-geschichte.pdf + RELOC/doc/latex/schule/Beispiele/bsp-geschichte.tex + RELOC/doc/latex/schule/Beispiele/bsp-pap.tikz + RELOC/doc/latex/schule/Beispiele/bsp-vocab.pdf + RELOC/doc/latex/schule/Beispiele/bsp-vocab.tex + RELOC/doc/latex/schule/Beispiele/hieroglyph-female.pdf + RELOC/doc/latex/schule/Beispiele/hieroglyph-male.pdf + RELOC/doc/latex/schule/Beispiele/minimal-ab-dev.pdf + RELOC/doc/latex/schule/Beispiele/minimal-ab-dev.tex + RELOC/doc/latex/schule/Beispiele/minimal-ab.pdf + RELOC/doc/latex/schule/Beispiele/minimal-ab.tex + RELOC/doc/latex/schule/Beispiele/minimal-ib.pdf + RELOC/doc/latex/schule/Beispiele/minimal-ib.tex + RELOC/doc/latex/schule/Beispiele/minimal-ka.pdf + RELOC/doc/latex/schule/Beispiele/minimal-ka.tex + RELOC/doc/latex/schule/Beispiele/minimal-kl-et.pdf + RELOC/doc/latex/schule/Beispiele/minimal-kl-et.tex + RELOC/doc/latex/schule/Beispiele/minimal-kl-teilpunkte.pdf + RELOC/doc/latex/schule/Beispiele/minimal-kl-teilpunkte.tex + RELOC/doc/latex/schule/Beispiele/minimal-kl.pdf + RELOC/doc/latex/schule/Beispiele/minimal-kl.tex + RELOC/doc/latex/schule/README details="Readme (German)" language="de" + RELOC/doc/latex/schule/allgemeines.tex + RELOC/doc/latex/schule/anhang.tex + RELOC/doc/latex/schule/beispiele.tex + RELOC/doc/latex/schule/changelog.tex + RELOC/doc/latex/schule/dev.tex + RELOC/doc/latex/schule/devFunktionen.tex + RELOC/doc/latex/schule/devModule.tex + RELOC/doc/latex/schule/devRichtlinien.tex + RELOC/doc/latex/schule/dokumenttypen.tex + RELOC/doc/latex/schule/fachGeschichte.tex + RELOC/doc/latex/schule/fachInformatik.tex + RELOC/doc/latex/schule/fachPhysik.tex + RELOC/doc/latex/schule/faecher.tex + RELOC/doc/latex/schule/faq.tex + RELOC/doc/latex/schule/lizenzen.tex + RELOC/doc/latex/schule/modulAufgaben.tex + RELOC/doc/latex/schule/modulBewertung.tex + RELOC/doc/latex/schule/modulFormat.tex + RELOC/doc/latex/schule/modulKuerzel.tex + RELOC/doc/latex/schule/modulLizenzen.tex + RELOC/doc/latex/schule/modulMetadaten.tex + RELOC/doc/latex/schule/modulPapiertypen.tex + RELOC/doc/latex/schule/modulSymbole.tex + RELOC/doc/latex/schule/modulTexte.tex + RELOC/doc/latex/schule/module.tex + RELOC/doc/latex/schule/schule-dokumentation.sty RELOC/doc/latex/schule/schule.pdf details="Package documentation (German)" language="de" -srccontainersize 38604 -srccontainerchecksum 493d5ccef52fdbbf5ea1c701ad4782a94482d5d3ae4ae68d1dd446a7549ca7e6340b30da2469b1e12138655851c18313bf53b132b0732793b3713d079cf8b4fc -srcfiles size=43 - RELOC/source/latex/schule/schule.dtx - RELOC/source/latex/schule/schule.ins -runfiles size=39 + RELOC/doc/latex/schule/schule.tex + RELOC/doc/latex/schule/todo.tex + RELOC/doc/latex/schule/typAb.tex + RELOC/doc/latex/schule/typFolie.tex + RELOC/doc/latex/schule/typKl.tex + RELOC/doc/latex/schule/typLeitprogramm.tex + RELOC/doc/latex/schule/typLzk.tex + RELOC/doc/latex/schule/typUb.tex + RELOC/doc/latex/schule/typUeb.tex + RELOC/doc/latex/schule/zusatzpaketRelaycircuit.tex + RELOC/doc/latex/schule/zusatzpaketSchuleAlt.tex + RELOC/doc/latex/schule/zusatzpaketSyntaxdi.tex + RELOC/doc/latex/schule/zusatzpaketUtfsym.tex + RELOC/doc/latex/schule/zusatzpakete.tex +runfiles size=4626 + RELOC/tex/latex/schule/Lizenzen/lizenz-cc-by-4.xmp + RELOC/tex/latex/schule/Lizenzen/lizenz-cc-by-nc-sa-4.xmp + RELOC/tex/latex/schule/Lizenzen/lizenz-cc-by-sa-4.xmp RELOC/tex/latex/schule/relaycircuit.sty + RELOC/tex/latex/schule/schule.fach.EvReligion.code.tex + RELOC/tex/latex/schule/schule.fach.Geschichte.code.tex + RELOC/tex/latex/schule/schule.fach.Geschichte.pakete.tex + RELOC/tex/latex/schule/schule.fach.Informatik.code.tex + RELOC/tex/latex/schule/schule.fach.Informatik.pakete.tex + RELOC/tex/latex/schule/schule.fach.Physik.pakete.tex + RELOC/tex/latex/schule/schule.mod.Aufgaben.code.tex + RELOC/tex/latex/schule/schule.mod.Aufgaben.optionen.tex + RELOC/tex/latex/schule/schule.mod.Aufgaben.pakete.tex + RELOC/tex/latex/schule/schule.mod.Bewertung.code.tex + RELOC/tex/latex/schule/schule.mod.Bewertung.optionen.tex + RELOC/tex/latex/schule/schule.mod.Bewertung.pakete.tex + RELOC/tex/latex/schule/schule.mod.Format.code.tex + RELOC/tex/latex/schule/schule.mod.Format.optionen.tex + RELOC/tex/latex/schule/schule.mod.Format.pakete.tex + RELOC/tex/latex/schule/schule.mod.Kuerzel.code.tex + RELOC/tex/latex/schule/schule.mod.Kuerzel.optionen.tex + RELOC/tex/latex/schule/schule.mod.Lizenzen.code.tex + RELOC/tex/latex/schule/schule.mod.Lizenzen.optionen.tex + RELOC/tex/latex/schule/schule.mod.Lizenzen.pakete.tex + RELOC/tex/latex/schule/schule.mod.Metadaten.code.tex + RELOC/tex/latex/schule/schule.mod.Metadaten.optionen.tex + RELOC/tex/latex/schule/schule.mod.Papiertypen.code.tex + RELOC/tex/latex/schule/schule.mod.Symbole.code.tex + RELOC/tex/latex/schule/schule.mod.Symbole.pakete.tex + RELOC/tex/latex/schule/schule.mod.Texte.code.tex + RELOC/tex/latex/schule/schule.mod.Texte.pakete.tex RELOC/tex/latex/schule/schule.sty + RELOC/tex/latex/schule/schule.typ.ab.code.tex + RELOC/tex/latex/schule/schule.typ.ab.pakete.tex + RELOC/tex/latex/schule/schule.typ.folie.code.tex + RELOC/tex/latex/schule/schule.typ.folie.pakete.tex + RELOC/tex/latex/schule/schule.typ.kl.code.tex + RELOC/tex/latex/schule/schule.typ.kl.optionen.tex + RELOC/tex/latex/schule/schule.typ.kl.pakete.tex + RELOC/tex/latex/schule/schule.typ.leit.code.tex + RELOC/tex/latex/schule/schule.typ.leit.optionen.tex + RELOC/tex/latex/schule/schule.typ.leit.pakete.tex + RELOC/tex/latex/schule/schule.typ.lzk.code.tex + RELOC/tex/latex/schule/schule.typ.lzk.pakete.tex + RELOC/tex/latex/schule/schule.typ.ub.code.tex + RELOC/tex/latex/schule/schule.typ.ub.pakete.tex + RELOC/tex/latex/schule/schule.typ.ueb.code.tex + RELOC/tex/latex/schule/schule.typ.ueb.pakete.tex RELOC/tex/latex/schule/schuleab.cls + RELOC/tex/latex/schule/schulealt.sty RELOC/tex/latex/schule/schulein.cls RELOC/tex/latex/schule/schuleit.cls RELOC/tex/latex/schule/schulekl.cls @@ -224205,11 +224559,1700 @@ RELOC/tex/latex/schule/schullzk.sty RELOC/tex/latex/schule/schulphy.sty RELOC/tex/latex/schule/syntaxdi.sty + RELOC/tex/latex/schule/tikz/usym1F000.tikz + RELOC/tex/latex/schule/tikz/usym1F001.tikz + RELOC/tex/latex/schule/tikz/usym1F002.tikz + RELOC/tex/latex/schule/tikz/usym1F003.tikz + RELOC/tex/latex/schule/tikz/usym1F004.tikz + RELOC/tex/latex/schule/tikz/usym1F005.tikz + RELOC/tex/latex/schule/tikz/usym1F006.tikz + RELOC/tex/latex/schule/tikz/usym1F007.tikz + RELOC/tex/latex/schule/tikz/usym1F008.tikz + RELOC/tex/latex/schule/tikz/usym1F009.tikz + RELOC/tex/latex/schule/tikz/usym1F00A.tikz + RELOC/tex/latex/schule/tikz/usym1F00B.tikz + RELOC/tex/latex/schule/tikz/usym1F00C.tikz + RELOC/tex/latex/schule/tikz/usym1F00D.tikz + RELOC/tex/latex/schule/tikz/usym1F00E.tikz + RELOC/tex/latex/schule/tikz/usym1F00F.tikz + RELOC/tex/latex/schule/tikz/usym1F010.tikz + RELOC/tex/latex/schule/tikz/usym1F011.tikz + RELOC/tex/latex/schule/tikz/usym1F012.tikz + RELOC/tex/latex/schule/tikz/usym1F013.tikz + RELOC/tex/latex/schule/tikz/usym1F014.tikz + RELOC/tex/latex/schule/tikz/usym1F015.tikz + RELOC/tex/latex/schule/tikz/usym1F016.tikz + RELOC/tex/latex/schule/tikz/usym1F017.tikz + RELOC/tex/latex/schule/tikz/usym1F018.tikz + RELOC/tex/latex/schule/tikz/usym1F019.tikz + RELOC/tex/latex/schule/tikz/usym1F01A.tikz + RELOC/tex/latex/schule/tikz/usym1F01B.tikz + RELOC/tex/latex/schule/tikz/usym1F01C.tikz + RELOC/tex/latex/schule/tikz/usym1F01D.tikz + RELOC/tex/latex/schule/tikz/usym1F01E.tikz + RELOC/tex/latex/schule/tikz/usym1F01F.tikz + RELOC/tex/latex/schule/tikz/usym1F020.tikz + RELOC/tex/latex/schule/tikz/usym1F021.tikz + RELOC/tex/latex/schule/tikz/usym1F022.tikz + RELOC/tex/latex/schule/tikz/usym1F023.tikz + RELOC/tex/latex/schule/tikz/usym1F024.tikz + RELOC/tex/latex/schule/tikz/usym1F025.tikz + RELOC/tex/latex/schule/tikz/usym1F026.tikz + RELOC/tex/latex/schule/tikz/usym1F027.tikz + RELOC/tex/latex/schule/tikz/usym1F028.tikz + RELOC/tex/latex/schule/tikz/usym1F029.tikz + RELOC/tex/latex/schule/tikz/usym1F02A.tikz + RELOC/tex/latex/schule/tikz/usym1F02B.tikz + RELOC/tex/latex/schule/tikz/usym1F02C.tikz + RELOC/tex/latex/schule/tikz/usym1F02D.tikz + RELOC/tex/latex/schule/tikz/usym1F02E.tikz + RELOC/tex/latex/schule/tikz/usym1F02F.tikz + RELOC/tex/latex/schule/tikz/usym1F030.tikz + RELOC/tex/latex/schule/tikz/usym1F031.tikz + RELOC/tex/latex/schule/tikz/usym1F032.tikz + RELOC/tex/latex/schule/tikz/usym1F033.tikz + RELOC/tex/latex/schule/tikz/usym1F034.tikz + RELOC/tex/latex/schule/tikz/usym1F035.tikz + RELOC/tex/latex/schule/tikz/usym1F036.tikz + RELOC/tex/latex/schule/tikz/usym1F037.tikz + RELOC/tex/latex/schule/tikz/usym1F038.tikz + RELOC/tex/latex/schule/tikz/usym1F039.tikz + RELOC/tex/latex/schule/tikz/usym1F03A.tikz + RELOC/tex/latex/schule/tikz/usym1F03B.tikz + RELOC/tex/latex/schule/tikz/usym1F03C.tikz + RELOC/tex/latex/schule/tikz/usym1F03D.tikz + RELOC/tex/latex/schule/tikz/usym1F03E.tikz + RELOC/tex/latex/schule/tikz/usym1F03F.tikz + RELOC/tex/latex/schule/tikz/usym1F040.tikz + RELOC/tex/latex/schule/tikz/usym1F041.tikz + RELOC/tex/latex/schule/tikz/usym1F042.tikz + RELOC/tex/latex/schule/tikz/usym1F043.tikz + RELOC/tex/latex/schule/tikz/usym1F044.tikz + RELOC/tex/latex/schule/tikz/usym1F045.tikz + RELOC/tex/latex/schule/tikz/usym1F046.tikz + RELOC/tex/latex/schule/tikz/usym1F047.tikz + RELOC/tex/latex/schule/tikz/usym1F048.tikz + RELOC/tex/latex/schule/tikz/usym1F049.tikz + RELOC/tex/latex/schule/tikz/usym1F04A.tikz + RELOC/tex/latex/schule/tikz/usym1F04B.tikz + RELOC/tex/latex/schule/tikz/usym1F04C.tikz + RELOC/tex/latex/schule/tikz/usym1F04D.tikz + RELOC/tex/latex/schule/tikz/usym1F04E.tikz + RELOC/tex/latex/schule/tikz/usym1F04F.tikz + RELOC/tex/latex/schule/tikz/usym1F050.tikz + RELOC/tex/latex/schule/tikz/usym1F051.tikz + RELOC/tex/latex/schule/tikz/usym1F052.tikz + RELOC/tex/latex/schule/tikz/usym1F053.tikz + RELOC/tex/latex/schule/tikz/usym1F054.tikz + RELOC/tex/latex/schule/tikz/usym1F055.tikz + RELOC/tex/latex/schule/tikz/usym1F056.tikz + RELOC/tex/latex/schule/tikz/usym1F057.tikz + RELOC/tex/latex/schule/tikz/usym1F058.tikz + RELOC/tex/latex/schule/tikz/usym1F059.tikz + RELOC/tex/latex/schule/tikz/usym1F05A.tikz + RELOC/tex/latex/schule/tikz/usym1F05B.tikz + RELOC/tex/latex/schule/tikz/usym1F05C.tikz + RELOC/tex/latex/schule/tikz/usym1F05D.tikz + RELOC/tex/latex/schule/tikz/usym1F05E.tikz + RELOC/tex/latex/schule/tikz/usym1F05F.tikz + RELOC/tex/latex/schule/tikz/usym1F060.tikz + RELOC/tex/latex/schule/tikz/usym1F061.tikz + RELOC/tex/latex/schule/tikz/usym1F062.tikz + RELOC/tex/latex/schule/tikz/usym1F063.tikz + RELOC/tex/latex/schule/tikz/usym1F064.tikz + RELOC/tex/latex/schule/tikz/usym1F065.tikz + RELOC/tex/latex/schule/tikz/usym1F066.tikz + RELOC/tex/latex/schule/tikz/usym1F067.tikz + RELOC/tex/latex/schule/tikz/usym1F068.tikz + RELOC/tex/latex/schule/tikz/usym1F069.tikz + RELOC/tex/latex/schule/tikz/usym1F06A.tikz + RELOC/tex/latex/schule/tikz/usym1F06B.tikz + RELOC/tex/latex/schule/tikz/usym1F06C.tikz + RELOC/tex/latex/schule/tikz/usym1F06D.tikz + RELOC/tex/latex/schule/tikz/usym1F06E.tikz + RELOC/tex/latex/schule/tikz/usym1F06F.tikz + RELOC/tex/latex/schule/tikz/usym1F070.tikz + RELOC/tex/latex/schule/tikz/usym1F071.tikz + RELOC/tex/latex/schule/tikz/usym1F072.tikz + RELOC/tex/latex/schule/tikz/usym1F073.tikz + RELOC/tex/latex/schule/tikz/usym1F074.tikz + RELOC/tex/latex/schule/tikz/usym1F075.tikz + RELOC/tex/latex/schule/tikz/usym1F076.tikz + RELOC/tex/latex/schule/tikz/usym1F077.tikz + RELOC/tex/latex/schule/tikz/usym1F078.tikz + RELOC/tex/latex/schule/tikz/usym1F079.tikz + RELOC/tex/latex/schule/tikz/usym1F07A.tikz + RELOC/tex/latex/schule/tikz/usym1F07B.tikz + RELOC/tex/latex/schule/tikz/usym1F07C.tikz + RELOC/tex/latex/schule/tikz/usym1F07D.tikz + RELOC/tex/latex/schule/tikz/usym1F07E.tikz + RELOC/tex/latex/schule/tikz/usym1F07F.tikz + RELOC/tex/latex/schule/tikz/usym1F080.tikz + RELOC/tex/latex/schule/tikz/usym1F081.tikz + RELOC/tex/latex/schule/tikz/usym1F082.tikz + RELOC/tex/latex/schule/tikz/usym1F083.tikz + RELOC/tex/latex/schule/tikz/usym1F084.tikz + RELOC/tex/latex/schule/tikz/usym1F085.tikz + RELOC/tex/latex/schule/tikz/usym1F086.tikz + RELOC/tex/latex/schule/tikz/usym1F087.tikz + RELOC/tex/latex/schule/tikz/usym1F088.tikz + RELOC/tex/latex/schule/tikz/usym1F089.tikz + RELOC/tex/latex/schule/tikz/usym1F08A.tikz + RELOC/tex/latex/schule/tikz/usym1F08B.tikz + RELOC/tex/latex/schule/tikz/usym1F08C.tikz + RELOC/tex/latex/schule/tikz/usym1F08D.tikz + RELOC/tex/latex/schule/tikz/usym1F08E.tikz + RELOC/tex/latex/schule/tikz/usym1F08F.tikz + RELOC/tex/latex/schule/tikz/usym1F090.tikz + RELOC/tex/latex/schule/tikz/usym1F091.tikz + RELOC/tex/latex/schule/tikz/usym1F092.tikz + RELOC/tex/latex/schule/tikz/usym1F093.tikz + RELOC/tex/latex/schule/tikz/usym1F094.tikz + RELOC/tex/latex/schule/tikz/usym1F095.tikz + RELOC/tex/latex/schule/tikz/usym1F096.tikz + RELOC/tex/latex/schule/tikz/usym1F097.tikz + RELOC/tex/latex/schule/tikz/usym1F098.tikz + RELOC/tex/latex/schule/tikz/usym1F099.tikz + RELOC/tex/latex/schule/tikz/usym1F09A.tikz + RELOC/tex/latex/schule/tikz/usym1F09B.tikz + RELOC/tex/latex/schule/tikz/usym1F09C.tikz + RELOC/tex/latex/schule/tikz/usym1F09D.tikz + RELOC/tex/latex/schule/tikz/usym1F09E.tikz + RELOC/tex/latex/schule/tikz/usym1F09F.tikz + RELOC/tex/latex/schule/tikz/usym1F0A0.tikz + RELOC/tex/latex/schule/tikz/usym1F0A1.tikz + RELOC/tex/latex/schule/tikz/usym1F0A2.tikz + RELOC/tex/latex/schule/tikz/usym1F0A3.tikz + RELOC/tex/latex/schule/tikz/usym1F0A4.tikz + RELOC/tex/latex/schule/tikz/usym1F0A5.tikz + RELOC/tex/latex/schule/tikz/usym1F0A6.tikz + RELOC/tex/latex/schule/tikz/usym1F0A7.tikz + RELOC/tex/latex/schule/tikz/usym1F0A8.tikz + RELOC/tex/latex/schule/tikz/usym1F0A9.tikz + RELOC/tex/latex/schule/tikz/usym1F0AA.tikz + RELOC/tex/latex/schule/tikz/usym1F0AB.tikz + RELOC/tex/latex/schule/tikz/usym1F0AC.tikz + RELOC/tex/latex/schule/tikz/usym1F0AD.tikz + RELOC/tex/latex/schule/tikz/usym1F0AE.tikz + RELOC/tex/latex/schule/tikz/usym1F0AF.tikz + RELOC/tex/latex/schule/tikz/usym1F0B0.tikz + RELOC/tex/latex/schule/tikz/usym1F0B1.tikz + RELOC/tex/latex/schule/tikz/usym1F0B2.tikz + RELOC/tex/latex/schule/tikz/usym1F0B3.tikz + RELOC/tex/latex/schule/tikz/usym1F0B4.tikz + RELOC/tex/latex/schule/tikz/usym1F0B5.tikz + RELOC/tex/latex/schule/tikz/usym1F0B6.tikz + RELOC/tex/latex/schule/tikz/usym1F0B7.tikz + RELOC/tex/latex/schule/tikz/usym1F0B8.tikz + RELOC/tex/latex/schule/tikz/usym1F0B9.tikz + RELOC/tex/latex/schule/tikz/usym1F0BA.tikz + RELOC/tex/latex/schule/tikz/usym1F0BB.tikz + RELOC/tex/latex/schule/tikz/usym1F0BC.tikz + RELOC/tex/latex/schule/tikz/usym1F0BD.tikz + RELOC/tex/latex/schule/tikz/usym1F0BE.tikz + RELOC/tex/latex/schule/tikz/usym1F0BF.tikz + RELOC/tex/latex/schule/tikz/usym1F0C0.tikz + RELOC/tex/latex/schule/tikz/usym1F0C1.tikz + RELOC/tex/latex/schule/tikz/usym1F0C2.tikz + RELOC/tex/latex/schule/tikz/usym1F0C3.tikz + RELOC/tex/latex/schule/tikz/usym1F0C4.tikz + RELOC/tex/latex/schule/tikz/usym1F0C5.tikz + RELOC/tex/latex/schule/tikz/usym1F0C6.tikz + RELOC/tex/latex/schule/tikz/usym1F0C7.tikz + RELOC/tex/latex/schule/tikz/usym1F0C8.tikz + RELOC/tex/latex/schule/tikz/usym1F0C9.tikz + RELOC/tex/latex/schule/tikz/usym1F0CA.tikz + RELOC/tex/latex/schule/tikz/usym1F0CB.tikz + RELOC/tex/latex/schule/tikz/usym1F0CC.tikz + RELOC/tex/latex/schule/tikz/usym1F0CD.tikz + RELOC/tex/latex/schule/tikz/usym1F0CE.tikz + RELOC/tex/latex/schule/tikz/usym1F0CF.tikz + RELOC/tex/latex/schule/tikz/usym1F0D0.tikz + RELOC/tex/latex/schule/tikz/usym1F0D1.tikz + RELOC/tex/latex/schule/tikz/usym1F0D2.tikz + RELOC/tex/latex/schule/tikz/usym1F0D3.tikz + RELOC/tex/latex/schule/tikz/usym1F0D4.tikz + RELOC/tex/latex/schule/tikz/usym1F0D5.tikz + RELOC/tex/latex/schule/tikz/usym1F0D6.tikz + RELOC/tex/latex/schule/tikz/usym1F0D7.tikz + RELOC/tex/latex/schule/tikz/usym1F0D8.tikz + RELOC/tex/latex/schule/tikz/usym1F0D9.tikz + RELOC/tex/latex/schule/tikz/usym1F0DA.tikz + RELOC/tex/latex/schule/tikz/usym1F0DB.tikz + RELOC/tex/latex/schule/tikz/usym1F0DC.tikz + RELOC/tex/latex/schule/tikz/usym1F0DD.tikz + RELOC/tex/latex/schule/tikz/usym1F0DE.tikz + RELOC/tex/latex/schule/tikz/usym1F0DF.tikz + RELOC/tex/latex/schule/tikz/usym1F0E0.tikz + RELOC/tex/latex/schule/tikz/usym1F0E1.tikz + RELOC/tex/latex/schule/tikz/usym1F0E2.tikz + RELOC/tex/latex/schule/tikz/usym1F0E3.tikz + RELOC/tex/latex/schule/tikz/usym1F0E4.tikz + RELOC/tex/latex/schule/tikz/usym1F0E5.tikz + RELOC/tex/latex/schule/tikz/usym1F0E6.tikz + RELOC/tex/latex/schule/tikz/usym1F0E7.tikz + RELOC/tex/latex/schule/tikz/usym1F0E8.tikz + RELOC/tex/latex/schule/tikz/usym1F0E9.tikz + RELOC/tex/latex/schule/tikz/usym1F0EA.tikz + RELOC/tex/latex/schule/tikz/usym1F0EB.tikz + RELOC/tex/latex/schule/tikz/usym1F0EC.tikz + RELOC/tex/latex/schule/tikz/usym1F0ED.tikz + RELOC/tex/latex/schule/tikz/usym1F0EE.tikz + RELOC/tex/latex/schule/tikz/usym1F0EF.tikz + RELOC/tex/latex/schule/tikz/usym1F0F0.tikz + RELOC/tex/latex/schule/tikz/usym1F0F1.tikz + RELOC/tex/latex/schule/tikz/usym1F0F2.tikz + RELOC/tex/latex/schule/tikz/usym1F0F3.tikz + RELOC/tex/latex/schule/tikz/usym1F0F4.tikz + RELOC/tex/latex/schule/tikz/usym1F0F5.tikz + RELOC/tex/latex/schule/tikz/usym1F0F6.tikz + RELOC/tex/latex/schule/tikz/usym1F0F7.tikz + RELOC/tex/latex/schule/tikz/usym1F0F8.tikz + RELOC/tex/latex/schule/tikz/usym1F0F9.tikz + RELOC/tex/latex/schule/tikz/usym1F0FA.tikz + RELOC/tex/latex/schule/tikz/usym1F0FB.tikz + RELOC/tex/latex/schule/tikz/usym1F0FC.tikz + RELOC/tex/latex/schule/tikz/usym1F0FD.tikz + RELOC/tex/latex/schule/tikz/usym1F0FE.tikz + RELOC/tex/latex/schule/tikz/usym1F0FF.tikz + RELOC/tex/latex/schule/tikz/usym1F300.tikz + RELOC/tex/latex/schule/tikz/usym1F301.tikz + RELOC/tex/latex/schule/tikz/usym1F302.tikz + RELOC/tex/latex/schule/tikz/usym1F303.tikz + RELOC/tex/latex/schule/tikz/usym1F304.tikz + RELOC/tex/latex/schule/tikz/usym1F305.tikz + RELOC/tex/latex/schule/tikz/usym1F306.tikz + RELOC/tex/latex/schule/tikz/usym1F307.tikz + RELOC/tex/latex/schule/tikz/usym1F308.tikz + RELOC/tex/latex/schule/tikz/usym1F309.tikz + RELOC/tex/latex/schule/tikz/usym1F30A.tikz + RELOC/tex/latex/schule/tikz/usym1F30B.tikz + RELOC/tex/latex/schule/tikz/usym1F30C.tikz + RELOC/tex/latex/schule/tikz/usym1F30D.tikz + RELOC/tex/latex/schule/tikz/usym1F30E.tikz + RELOC/tex/latex/schule/tikz/usym1F30F.tikz + RELOC/tex/latex/schule/tikz/usym1F310.tikz + RELOC/tex/latex/schule/tikz/usym1F311.tikz + RELOC/tex/latex/schule/tikz/usym1F312.tikz + RELOC/tex/latex/schule/tikz/usym1F313.tikz + RELOC/tex/latex/schule/tikz/usym1F314.tikz + RELOC/tex/latex/schule/tikz/usym1F315.tikz + RELOC/tex/latex/schule/tikz/usym1F316.tikz + RELOC/tex/latex/schule/tikz/usym1F317.tikz + RELOC/tex/latex/schule/tikz/usym1F318.tikz + RELOC/tex/latex/schule/tikz/usym1F319.tikz + RELOC/tex/latex/schule/tikz/usym1F31A.tikz + RELOC/tex/latex/schule/tikz/usym1F31B.tikz + RELOC/tex/latex/schule/tikz/usym1F31C.tikz + RELOC/tex/latex/schule/tikz/usym1F31D.tikz + RELOC/tex/latex/schule/tikz/usym1F31E.tikz + RELOC/tex/latex/schule/tikz/usym1F31F.tikz + RELOC/tex/latex/schule/tikz/usym1F320.tikz + RELOC/tex/latex/schule/tikz/usym1F321.tikz + RELOC/tex/latex/schule/tikz/usym1F322.tikz + RELOC/tex/latex/schule/tikz/usym1F323.tikz + RELOC/tex/latex/schule/tikz/usym1F324.tikz + RELOC/tex/latex/schule/tikz/usym1F325.tikz + RELOC/tex/latex/schule/tikz/usym1F326.tikz + RELOC/tex/latex/schule/tikz/usym1F327.tikz + RELOC/tex/latex/schule/tikz/usym1F328.tikz + RELOC/tex/latex/schule/tikz/usym1F329.tikz + RELOC/tex/latex/schule/tikz/usym1F32A.tikz + RELOC/tex/latex/schule/tikz/usym1F32B.tikz + RELOC/tex/latex/schule/tikz/usym1F32C.tikz + RELOC/tex/latex/schule/tikz/usym1F32D.tikz + RELOC/tex/latex/schule/tikz/usym1F32E.tikz + RELOC/tex/latex/schule/tikz/usym1F32F.tikz + RELOC/tex/latex/schule/tikz/usym1F330.tikz + RELOC/tex/latex/schule/tikz/usym1F331.tikz + RELOC/tex/latex/schule/tikz/usym1F332.tikz + RELOC/tex/latex/schule/tikz/usym1F333.tikz + RELOC/tex/latex/schule/tikz/usym1F334.tikz + RELOC/tex/latex/schule/tikz/usym1F335.tikz + RELOC/tex/latex/schule/tikz/usym1F336.tikz + RELOC/tex/latex/schule/tikz/usym1F337.tikz + RELOC/tex/latex/schule/tikz/usym1F338.tikz + RELOC/tex/latex/schule/tikz/usym1F339.tikz + RELOC/tex/latex/schule/tikz/usym1F33A.tikz + RELOC/tex/latex/schule/tikz/usym1F33B.tikz + RELOC/tex/latex/schule/tikz/usym1F33C.tikz + RELOC/tex/latex/schule/tikz/usym1F33D.tikz + RELOC/tex/latex/schule/tikz/usym1F33E.tikz + RELOC/tex/latex/schule/tikz/usym1F33F.tikz + RELOC/tex/latex/schule/tikz/usym1F340.tikz + RELOC/tex/latex/schule/tikz/usym1F341.tikz + RELOC/tex/latex/schule/tikz/usym1F342.tikz + RELOC/tex/latex/schule/tikz/usym1F343.tikz + RELOC/tex/latex/schule/tikz/usym1F344.tikz + RELOC/tex/latex/schule/tikz/usym1F345.tikz + RELOC/tex/latex/schule/tikz/usym1F346.tikz + RELOC/tex/latex/schule/tikz/usym1F347.tikz + RELOC/tex/latex/schule/tikz/usym1F348.tikz + RELOC/tex/latex/schule/tikz/usym1F349.tikz + RELOC/tex/latex/schule/tikz/usym1F34A.tikz + RELOC/tex/latex/schule/tikz/usym1F34B.tikz + RELOC/tex/latex/schule/tikz/usym1F34C.tikz + RELOC/tex/latex/schule/tikz/usym1F34D.tikz + RELOC/tex/latex/schule/tikz/usym1F34E.tikz + RELOC/tex/latex/schule/tikz/usym1F34F.tikz + RELOC/tex/latex/schule/tikz/usym1F350.tikz + RELOC/tex/latex/schule/tikz/usym1F351.tikz + RELOC/tex/latex/schule/tikz/usym1F352.tikz + RELOC/tex/latex/schule/tikz/usym1F353.tikz + RELOC/tex/latex/schule/tikz/usym1F354.tikz + RELOC/tex/latex/schule/tikz/usym1F355.tikz + RELOC/tex/latex/schule/tikz/usym1F356.tikz + RELOC/tex/latex/schule/tikz/usym1F357.tikz + RELOC/tex/latex/schule/tikz/usym1F358.tikz + RELOC/tex/latex/schule/tikz/usym1F359.tikz + RELOC/tex/latex/schule/tikz/usym1F35A.tikz + RELOC/tex/latex/schule/tikz/usym1F35B.tikz + RELOC/tex/latex/schule/tikz/usym1F35C.tikz + RELOC/tex/latex/schule/tikz/usym1F35D.tikz + RELOC/tex/latex/schule/tikz/usym1F35E.tikz + RELOC/tex/latex/schule/tikz/usym1F35F.tikz + RELOC/tex/latex/schule/tikz/usym1F360.tikz + RELOC/tex/latex/schule/tikz/usym1F361.tikz + RELOC/tex/latex/schule/tikz/usym1F362.tikz + RELOC/tex/latex/schule/tikz/usym1F363.tikz + RELOC/tex/latex/schule/tikz/usym1F364.tikz + RELOC/tex/latex/schule/tikz/usym1F365.tikz + RELOC/tex/latex/schule/tikz/usym1F366.tikz + RELOC/tex/latex/schule/tikz/usym1F367.tikz + RELOC/tex/latex/schule/tikz/usym1F368.tikz + RELOC/tex/latex/schule/tikz/usym1F369.tikz + RELOC/tex/latex/schule/tikz/usym1F36A.tikz + RELOC/tex/latex/schule/tikz/usym1F36B.tikz + RELOC/tex/latex/schule/tikz/usym1F36C.tikz + RELOC/tex/latex/schule/tikz/usym1F36D.tikz + RELOC/tex/latex/schule/tikz/usym1F36E.tikz + RELOC/tex/latex/schule/tikz/usym1F36F.tikz + RELOC/tex/latex/schule/tikz/usym1F370.tikz + RELOC/tex/latex/schule/tikz/usym1F371.tikz + RELOC/tex/latex/schule/tikz/usym1F372.tikz + RELOC/tex/latex/schule/tikz/usym1F373.tikz + RELOC/tex/latex/schule/tikz/usym1F374.tikz + RELOC/tex/latex/schule/tikz/usym1F375.tikz + RELOC/tex/latex/schule/tikz/usym1F376.tikz + RELOC/tex/latex/schule/tikz/usym1F377.tikz + RELOC/tex/latex/schule/tikz/usym1F378.tikz + RELOC/tex/latex/schule/tikz/usym1F379.tikz + RELOC/tex/latex/schule/tikz/usym1F37A.tikz + RELOC/tex/latex/schule/tikz/usym1F37B.tikz + RELOC/tex/latex/schule/tikz/usym1F37C.tikz + RELOC/tex/latex/schule/tikz/usym1F37D.tikz + RELOC/tex/latex/schule/tikz/usym1F37E.tikz + RELOC/tex/latex/schule/tikz/usym1F37F.tikz + RELOC/tex/latex/schule/tikz/usym1F380.tikz + RELOC/tex/latex/schule/tikz/usym1F381.tikz + RELOC/tex/latex/schule/tikz/usym1F382.tikz + RELOC/tex/latex/schule/tikz/usym1F383.tikz + RELOC/tex/latex/schule/tikz/usym1F384.tikz + RELOC/tex/latex/schule/tikz/usym1F385.tikz + RELOC/tex/latex/schule/tikz/usym1F386.tikz + RELOC/tex/latex/schule/tikz/usym1F387.tikz + RELOC/tex/latex/schule/tikz/usym1F388.tikz + RELOC/tex/latex/schule/tikz/usym1F389.tikz + RELOC/tex/latex/schule/tikz/usym1F38A.tikz + RELOC/tex/latex/schule/tikz/usym1F38B.tikz + RELOC/tex/latex/schule/tikz/usym1F38C.tikz + RELOC/tex/latex/schule/tikz/usym1F38D.tikz + RELOC/tex/latex/schule/tikz/usym1F38E.tikz + RELOC/tex/latex/schule/tikz/usym1F38F.tikz + RELOC/tex/latex/schule/tikz/usym1F390.tikz + RELOC/tex/latex/schule/tikz/usym1F391.tikz + RELOC/tex/latex/schule/tikz/usym1F392.tikz + RELOC/tex/latex/schule/tikz/usym1F393.tikz + RELOC/tex/latex/schule/tikz/usym1F394.tikz + RELOC/tex/latex/schule/tikz/usym1F395.tikz + RELOC/tex/latex/schule/tikz/usym1F396.tikz + RELOC/tex/latex/schule/tikz/usym1F397.tikz + RELOC/tex/latex/schule/tikz/usym1F398.tikz + RELOC/tex/latex/schule/tikz/usym1F399.tikz + RELOC/tex/latex/schule/tikz/usym1F39A.tikz + RELOC/tex/latex/schule/tikz/usym1F39B.tikz + RELOC/tex/latex/schule/tikz/usym1F39C.tikz + RELOC/tex/latex/schule/tikz/usym1F39D.tikz + RELOC/tex/latex/schule/tikz/usym1F39E.tikz + RELOC/tex/latex/schule/tikz/usym1F39F.tikz + RELOC/tex/latex/schule/tikz/usym1F3A0.tikz + RELOC/tex/latex/schule/tikz/usym1F3A1.tikz + RELOC/tex/latex/schule/tikz/usym1F3A2.tikz + RELOC/tex/latex/schule/tikz/usym1F3A3.tikz + RELOC/tex/latex/schule/tikz/usym1F3A4.tikz + RELOC/tex/latex/schule/tikz/usym1F3A5.tikz + RELOC/tex/latex/schule/tikz/usym1F3A6.tikz + RELOC/tex/latex/schule/tikz/usym1F3A7.tikz + RELOC/tex/latex/schule/tikz/usym1F3A8.tikz + RELOC/tex/latex/schule/tikz/usym1F3A9.tikz + RELOC/tex/latex/schule/tikz/usym1F3AA.tikz + RELOC/tex/latex/schule/tikz/usym1F3AB.tikz + RELOC/tex/latex/schule/tikz/usym1F3AC.tikz + RELOC/tex/latex/schule/tikz/usym1F3AD.tikz + RELOC/tex/latex/schule/tikz/usym1F3AE.tikz + RELOC/tex/latex/schule/tikz/usym1F3AF.tikz + RELOC/tex/latex/schule/tikz/usym1F3B0.tikz + RELOC/tex/latex/schule/tikz/usym1F3B1.tikz + RELOC/tex/latex/schule/tikz/usym1F3B2.tikz + RELOC/tex/latex/schule/tikz/usym1F3B3.tikz + RELOC/tex/latex/schule/tikz/usym1F3B4.tikz + RELOC/tex/latex/schule/tikz/usym1F3B5.tikz + RELOC/tex/latex/schule/tikz/usym1F3B6.tikz + RELOC/tex/latex/schule/tikz/usym1F3B7.tikz + RELOC/tex/latex/schule/tikz/usym1F3B8.tikz + RELOC/tex/latex/schule/tikz/usym1F3B9.tikz + RELOC/tex/latex/schule/tikz/usym1F3BA.tikz + RELOC/tex/latex/schule/tikz/usym1F3BB.tikz + RELOC/tex/latex/schule/tikz/usym1F3BC.tikz + RELOC/tex/latex/schule/tikz/usym1F3BD.tikz + RELOC/tex/latex/schule/tikz/usym1F3BE.tikz + RELOC/tex/latex/schule/tikz/usym1F3BF.tikz + RELOC/tex/latex/schule/tikz/usym1F3C0.tikz + RELOC/tex/latex/schule/tikz/usym1F3C1.tikz + RELOC/tex/latex/schule/tikz/usym1F3C2.tikz + RELOC/tex/latex/schule/tikz/usym1F3C3.tikz + RELOC/tex/latex/schule/tikz/usym1F3C4.tikz + RELOC/tex/latex/schule/tikz/usym1F3C5.tikz + RELOC/tex/latex/schule/tikz/usym1F3C6.tikz + RELOC/tex/latex/schule/tikz/usym1F3C7.tikz + RELOC/tex/latex/schule/tikz/usym1F3C8.tikz + RELOC/tex/latex/schule/tikz/usym1F3C9.tikz + RELOC/tex/latex/schule/tikz/usym1F3CA.tikz + RELOC/tex/latex/schule/tikz/usym1F3CB.tikz + RELOC/tex/latex/schule/tikz/usym1F3CC.tikz + RELOC/tex/latex/schule/tikz/usym1F3CD.tikz + RELOC/tex/latex/schule/tikz/usym1F3CE.tikz + RELOC/tex/latex/schule/tikz/usym1F3CF.tikz + RELOC/tex/latex/schule/tikz/usym1F3D0.tikz + RELOC/tex/latex/schule/tikz/usym1F3D1.tikz + RELOC/tex/latex/schule/tikz/usym1F3D2.tikz + RELOC/tex/latex/schule/tikz/usym1F3D3.tikz + RELOC/tex/latex/schule/tikz/usym1F3D4.tikz + RELOC/tex/latex/schule/tikz/usym1F3D5.tikz + RELOC/tex/latex/schule/tikz/usym1F3D6.tikz + RELOC/tex/latex/schule/tikz/usym1F3D7.tikz + RELOC/tex/latex/schule/tikz/usym1F3D8.tikz + RELOC/tex/latex/schule/tikz/usym1F3D9.tikz + RELOC/tex/latex/schule/tikz/usym1F3DA.tikz + RELOC/tex/latex/schule/tikz/usym1F3DB.tikz + RELOC/tex/latex/schule/tikz/usym1F3DC.tikz + RELOC/tex/latex/schule/tikz/usym1F3DD.tikz + RELOC/tex/latex/schule/tikz/usym1F3DE.tikz + RELOC/tex/latex/schule/tikz/usym1F3DF.tikz + RELOC/tex/latex/schule/tikz/usym1F3E0.tikz + RELOC/tex/latex/schule/tikz/usym1F3E1.tikz + RELOC/tex/latex/schule/tikz/usym1F3E2.tikz + RELOC/tex/latex/schule/tikz/usym1F3E3.tikz + RELOC/tex/latex/schule/tikz/usym1F3E4.tikz + RELOC/tex/latex/schule/tikz/usym1F3E5.tikz + RELOC/tex/latex/schule/tikz/usym1F3E6.tikz + RELOC/tex/latex/schule/tikz/usym1F3E7.tikz + RELOC/tex/latex/schule/tikz/usym1F3E8.tikz + RELOC/tex/latex/schule/tikz/usym1F3E9.tikz + RELOC/tex/latex/schule/tikz/usym1F3EA.tikz + RELOC/tex/latex/schule/tikz/usym1F3EB.tikz + RELOC/tex/latex/schule/tikz/usym1F3EC.tikz + RELOC/tex/latex/schule/tikz/usym1F3ED.tikz + RELOC/tex/latex/schule/tikz/usym1F3EE.tikz + RELOC/tex/latex/schule/tikz/usym1F3EF.tikz + RELOC/tex/latex/schule/tikz/usym1F3F0.tikz + RELOC/tex/latex/schule/tikz/usym1F3F1.tikz + RELOC/tex/latex/schule/tikz/usym1F3F2.tikz + RELOC/tex/latex/schule/tikz/usym1F3F3.tikz + RELOC/tex/latex/schule/tikz/usym1F3F4.tikz + RELOC/tex/latex/schule/tikz/usym1F3F5.tikz + RELOC/tex/latex/schule/tikz/usym1F3F6.tikz + RELOC/tex/latex/schule/tikz/usym1F3F7.tikz + RELOC/tex/latex/schule/tikz/usym1F3F8.tikz + RELOC/tex/latex/schule/tikz/usym1F3F9.tikz + RELOC/tex/latex/schule/tikz/usym1F3FA.tikz + RELOC/tex/latex/schule/tikz/usym1F3FB.tikz + RELOC/tex/latex/schule/tikz/usym1F3FC.tikz + RELOC/tex/latex/schule/tikz/usym1F3FD.tikz + RELOC/tex/latex/schule/tikz/usym1F3FE.tikz + RELOC/tex/latex/schule/tikz/usym1F3FF.tikz + RELOC/tex/latex/schule/tikz/usym1F400.tikz + RELOC/tex/latex/schule/tikz/usym1F401.tikz + RELOC/tex/latex/schule/tikz/usym1F402.tikz + RELOC/tex/latex/schule/tikz/usym1F403.tikz + RELOC/tex/latex/schule/tikz/usym1F404.tikz + RELOC/tex/latex/schule/tikz/usym1F405.tikz + RELOC/tex/latex/schule/tikz/usym1F406.tikz + RELOC/tex/latex/schule/tikz/usym1F407.tikz + RELOC/tex/latex/schule/tikz/usym1F408.tikz + RELOC/tex/latex/schule/tikz/usym1F409.tikz + RELOC/tex/latex/schule/tikz/usym1F40A.tikz + RELOC/tex/latex/schule/tikz/usym1F40B.tikz + RELOC/tex/latex/schule/tikz/usym1F40C.tikz + RELOC/tex/latex/schule/tikz/usym1F40D.tikz + RELOC/tex/latex/schule/tikz/usym1F40E.tikz + RELOC/tex/latex/schule/tikz/usym1F40F.tikz + RELOC/tex/latex/schule/tikz/usym1F410.tikz + RELOC/tex/latex/schule/tikz/usym1F411.tikz + RELOC/tex/latex/schule/tikz/usym1F412.tikz + RELOC/tex/latex/schule/tikz/usym1F413.tikz + RELOC/tex/latex/schule/tikz/usym1F414.tikz + RELOC/tex/latex/schule/tikz/usym1F415.tikz + RELOC/tex/latex/schule/tikz/usym1F416.tikz + RELOC/tex/latex/schule/tikz/usym1F417.tikz + RELOC/tex/latex/schule/tikz/usym1F418.tikz + RELOC/tex/latex/schule/tikz/usym1F419.tikz + RELOC/tex/latex/schule/tikz/usym1F41A.tikz + RELOC/tex/latex/schule/tikz/usym1F41B.tikz + RELOC/tex/latex/schule/tikz/usym1F41C.tikz + RELOC/tex/latex/schule/tikz/usym1F41D.tikz + RELOC/tex/latex/schule/tikz/usym1F41E.tikz + RELOC/tex/latex/schule/tikz/usym1F41F.tikz + RELOC/tex/latex/schule/tikz/usym1F420.tikz + RELOC/tex/latex/schule/tikz/usym1F421.tikz + RELOC/tex/latex/schule/tikz/usym1F422.tikz + RELOC/tex/latex/schule/tikz/usym1F423.tikz + RELOC/tex/latex/schule/tikz/usym1F424.tikz + RELOC/tex/latex/schule/tikz/usym1F425.tikz + RELOC/tex/latex/schule/tikz/usym1F426.tikz + RELOC/tex/latex/schule/tikz/usym1F427.tikz + RELOC/tex/latex/schule/tikz/usym1F428.tikz + RELOC/tex/latex/schule/tikz/usym1F429.tikz + RELOC/tex/latex/schule/tikz/usym1F42A.tikz + RELOC/tex/latex/schule/tikz/usym1F42B.tikz + RELOC/tex/latex/schule/tikz/usym1F42C.tikz + RELOC/tex/latex/schule/tikz/usym1F42D.tikz + RELOC/tex/latex/schule/tikz/usym1F42E.tikz + RELOC/tex/latex/schule/tikz/usym1F42F.tikz + RELOC/tex/latex/schule/tikz/usym1F430.tikz + RELOC/tex/latex/schule/tikz/usym1F431.tikz + RELOC/tex/latex/schule/tikz/usym1F432.tikz + RELOC/tex/latex/schule/tikz/usym1F433.tikz + RELOC/tex/latex/schule/tikz/usym1F434.tikz + RELOC/tex/latex/schule/tikz/usym1F435.tikz + RELOC/tex/latex/schule/tikz/usym1F436.tikz + RELOC/tex/latex/schule/tikz/usym1F437.tikz + RELOC/tex/latex/schule/tikz/usym1F438.tikz + RELOC/tex/latex/schule/tikz/usym1F439.tikz + RELOC/tex/latex/schule/tikz/usym1F43A.tikz + RELOC/tex/latex/schule/tikz/usym1F43B.tikz + RELOC/tex/latex/schule/tikz/usym1F43C.tikz + RELOC/tex/latex/schule/tikz/usym1F43D.tikz + RELOC/tex/latex/schule/tikz/usym1F43E.tikz + RELOC/tex/latex/schule/tikz/usym1F43F.tikz + RELOC/tex/latex/schule/tikz/usym1F440.tikz + RELOC/tex/latex/schule/tikz/usym1F441.tikz + RELOC/tex/latex/schule/tikz/usym1F442.tikz + RELOC/tex/latex/schule/tikz/usym1F443.tikz + RELOC/tex/latex/schule/tikz/usym1F444.tikz + RELOC/tex/latex/schule/tikz/usym1F445.tikz + RELOC/tex/latex/schule/tikz/usym1F446.tikz + RELOC/tex/latex/schule/tikz/usym1F447.tikz + RELOC/tex/latex/schule/tikz/usym1F448.tikz + RELOC/tex/latex/schule/tikz/usym1F449.tikz + RELOC/tex/latex/schule/tikz/usym1F44A.tikz + RELOC/tex/latex/schule/tikz/usym1F44B.tikz + RELOC/tex/latex/schule/tikz/usym1F44C.tikz + RELOC/tex/latex/schule/tikz/usym1F44D.tikz + RELOC/tex/latex/schule/tikz/usym1F44E.tikz + RELOC/tex/latex/schule/tikz/usym1F44F.tikz + RELOC/tex/latex/schule/tikz/usym1F450.tikz + RELOC/tex/latex/schule/tikz/usym1F451.tikz + RELOC/tex/latex/schule/tikz/usym1F452.tikz + RELOC/tex/latex/schule/tikz/usym1F453.tikz + RELOC/tex/latex/schule/tikz/usym1F454.tikz + RELOC/tex/latex/schule/tikz/usym1F455.tikz + RELOC/tex/latex/schule/tikz/usym1F456.tikz + RELOC/tex/latex/schule/tikz/usym1F457.tikz + RELOC/tex/latex/schule/tikz/usym1F458.tikz + RELOC/tex/latex/schule/tikz/usym1F459.tikz + RELOC/tex/latex/schule/tikz/usym1F45A.tikz + RELOC/tex/latex/schule/tikz/usym1F45B.tikz + RELOC/tex/latex/schule/tikz/usym1F45C.tikz + RELOC/tex/latex/schule/tikz/usym1F45D.tikz + RELOC/tex/latex/schule/tikz/usym1F45E.tikz + RELOC/tex/latex/schule/tikz/usym1F45F.tikz + RELOC/tex/latex/schule/tikz/usym1F460.tikz + RELOC/tex/latex/schule/tikz/usym1F461.tikz + RELOC/tex/latex/schule/tikz/usym1F462.tikz + RELOC/tex/latex/schule/tikz/usym1F463.tikz + RELOC/tex/latex/schule/tikz/usym1F464.tikz + RELOC/tex/latex/schule/tikz/usym1F465.tikz + RELOC/tex/latex/schule/tikz/usym1F466.tikz + RELOC/tex/latex/schule/tikz/usym1F467.tikz + RELOC/tex/latex/schule/tikz/usym1F468.tikz + RELOC/tex/latex/schule/tikz/usym1F469.tikz + RELOC/tex/latex/schule/tikz/usym1F46A.tikz + RELOC/tex/latex/schule/tikz/usym1F46B.tikz + RELOC/tex/latex/schule/tikz/usym1F46C.tikz + RELOC/tex/latex/schule/tikz/usym1F46D.tikz + RELOC/tex/latex/schule/tikz/usym1F46E.tikz + RELOC/tex/latex/schule/tikz/usym1F46F.tikz + RELOC/tex/latex/schule/tikz/usym1F470.tikz + RELOC/tex/latex/schule/tikz/usym1F471.tikz + RELOC/tex/latex/schule/tikz/usym1F472.tikz + RELOC/tex/latex/schule/tikz/usym1F473.tikz + RELOC/tex/latex/schule/tikz/usym1F474.tikz + RELOC/tex/latex/schule/tikz/usym1F475.tikz + RELOC/tex/latex/schule/tikz/usym1F476.tikz + RELOC/tex/latex/schule/tikz/usym1F477.tikz + RELOC/tex/latex/schule/tikz/usym1F478.tikz + RELOC/tex/latex/schule/tikz/usym1F479.tikz + RELOC/tex/latex/schule/tikz/usym1F47A.tikz + RELOC/tex/latex/schule/tikz/usym1F47B.tikz + RELOC/tex/latex/schule/tikz/usym1F47C.tikz + RELOC/tex/latex/schule/tikz/usym1F47D.tikz + RELOC/tex/latex/schule/tikz/usym1F47E.tikz + RELOC/tex/latex/schule/tikz/usym1F47F.tikz + RELOC/tex/latex/schule/tikz/usym1F480.tikz + RELOC/tex/latex/schule/tikz/usym1F481.tikz + RELOC/tex/latex/schule/tikz/usym1F482.tikz + RELOC/tex/latex/schule/tikz/usym1F483.tikz + RELOC/tex/latex/schule/tikz/usym1F484.tikz + RELOC/tex/latex/schule/tikz/usym1F485.tikz + RELOC/tex/latex/schule/tikz/usym1F486.tikz + RELOC/tex/latex/schule/tikz/usym1F487.tikz + RELOC/tex/latex/schule/tikz/usym1F488.tikz + RELOC/tex/latex/schule/tikz/usym1F489.tikz + RELOC/tex/latex/schule/tikz/usym1F48A.tikz + RELOC/tex/latex/schule/tikz/usym1F48B.tikz + RELOC/tex/latex/schule/tikz/usym1F48C.tikz + RELOC/tex/latex/schule/tikz/usym1F48D.tikz + RELOC/tex/latex/schule/tikz/usym1F48E.tikz + RELOC/tex/latex/schule/tikz/usym1F48F.tikz + RELOC/tex/latex/schule/tikz/usym1F490.tikz + RELOC/tex/latex/schule/tikz/usym1F491.tikz + RELOC/tex/latex/schule/tikz/usym1F492.tikz + RELOC/tex/latex/schule/tikz/usym1F493.tikz + RELOC/tex/latex/schule/tikz/usym1F494.tikz + RELOC/tex/latex/schule/tikz/usym1F495.tikz + RELOC/tex/latex/schule/tikz/usym1F496.tikz + RELOC/tex/latex/schule/tikz/usym1F497.tikz + RELOC/tex/latex/schule/tikz/usym1F498.tikz + RELOC/tex/latex/schule/tikz/usym1F499.tikz + RELOC/tex/latex/schule/tikz/usym1F49A.tikz + RELOC/tex/latex/schule/tikz/usym1F49B.tikz + RELOC/tex/latex/schule/tikz/usym1F49C.tikz + RELOC/tex/latex/schule/tikz/usym1F49D.tikz + RELOC/tex/latex/schule/tikz/usym1F49E.tikz + RELOC/tex/latex/schule/tikz/usym1F49F.tikz + RELOC/tex/latex/schule/tikz/usym1F4A0.tikz + RELOC/tex/latex/schule/tikz/usym1F4A1.tikz + RELOC/tex/latex/schule/tikz/usym1F4A2.tikz + RELOC/tex/latex/schule/tikz/usym1F4A3.tikz + RELOC/tex/latex/schule/tikz/usym1F4A4.tikz + RELOC/tex/latex/schule/tikz/usym1F4A5.tikz + RELOC/tex/latex/schule/tikz/usym1F4A6.tikz + RELOC/tex/latex/schule/tikz/usym1F4A7.tikz + RELOC/tex/latex/schule/tikz/usym1F4A8.tikz + RELOC/tex/latex/schule/tikz/usym1F4A9.tikz + RELOC/tex/latex/schule/tikz/usym1F4AA.tikz + RELOC/tex/latex/schule/tikz/usym1F4AB.tikz + RELOC/tex/latex/schule/tikz/usym1F4AC.tikz + RELOC/tex/latex/schule/tikz/usym1F4AD.tikz + RELOC/tex/latex/schule/tikz/usym1F4AE.tikz + RELOC/tex/latex/schule/tikz/usym1F4AF.tikz + RELOC/tex/latex/schule/tikz/usym1F4B0.tikz + RELOC/tex/latex/schule/tikz/usym1F4B1.tikz + RELOC/tex/latex/schule/tikz/usym1F4B2.tikz + RELOC/tex/latex/schule/tikz/usym1F4B3.tikz + RELOC/tex/latex/schule/tikz/usym1F4B4.tikz + RELOC/tex/latex/schule/tikz/usym1F4B5.tikz + RELOC/tex/latex/schule/tikz/usym1F4B6.tikz + RELOC/tex/latex/schule/tikz/usym1F4B7.tikz + RELOC/tex/latex/schule/tikz/usym1F4B8.tikz + RELOC/tex/latex/schule/tikz/usym1F4B9.tikz + RELOC/tex/latex/schule/tikz/usym1F4BA.tikz + RELOC/tex/latex/schule/tikz/usym1F4BB.tikz + RELOC/tex/latex/schule/tikz/usym1F4BC.tikz + RELOC/tex/latex/schule/tikz/usym1F4BD.tikz + RELOC/tex/latex/schule/tikz/usym1F4BE.tikz + RELOC/tex/latex/schule/tikz/usym1F4BF.tikz + RELOC/tex/latex/schule/tikz/usym1F4C0.tikz + RELOC/tex/latex/schule/tikz/usym1F4C1.tikz + RELOC/tex/latex/schule/tikz/usym1F4C2.tikz + RELOC/tex/latex/schule/tikz/usym1F4C3.tikz + RELOC/tex/latex/schule/tikz/usym1F4C4.tikz + RELOC/tex/latex/schule/tikz/usym1F4C5.tikz + RELOC/tex/latex/schule/tikz/usym1F4C6.tikz + RELOC/tex/latex/schule/tikz/usym1F4C7.tikz + RELOC/tex/latex/schule/tikz/usym1F4C8.tikz + RELOC/tex/latex/schule/tikz/usym1F4C9.tikz + RELOC/tex/latex/schule/tikz/usym1F4CA.tikz + RELOC/tex/latex/schule/tikz/usym1F4CB.tikz + RELOC/tex/latex/schule/tikz/usym1F4CC.tikz + RELOC/tex/latex/schule/tikz/usym1F4CD.tikz + RELOC/tex/latex/schule/tikz/usym1F4CE.tikz + RELOC/tex/latex/schule/tikz/usym1F4CF.tikz + RELOC/tex/latex/schule/tikz/usym1F4D0.tikz + RELOC/tex/latex/schule/tikz/usym1F4D1.tikz + RELOC/tex/latex/schule/tikz/usym1F4D2.tikz + RELOC/tex/latex/schule/tikz/usym1F4D3.tikz + RELOC/tex/latex/schule/tikz/usym1F4D4.tikz + RELOC/tex/latex/schule/tikz/usym1F4D5.tikz + RELOC/tex/latex/schule/tikz/usym1F4D6.tikz + RELOC/tex/latex/schule/tikz/usym1F4D7.tikz + RELOC/tex/latex/schule/tikz/usym1F4D8.tikz + RELOC/tex/latex/schule/tikz/usym1F4D9.tikz + RELOC/tex/latex/schule/tikz/usym1F4DA.tikz + RELOC/tex/latex/schule/tikz/usym1F4DB.tikz + RELOC/tex/latex/schule/tikz/usym1F4DC.tikz + RELOC/tex/latex/schule/tikz/usym1F4DD.tikz + RELOC/tex/latex/schule/tikz/usym1F4DE.tikz + RELOC/tex/latex/schule/tikz/usym1F4DF.tikz + RELOC/tex/latex/schule/tikz/usym1F4E0.tikz + RELOC/tex/latex/schule/tikz/usym1F4E1.tikz + RELOC/tex/latex/schule/tikz/usym1F4E2.tikz + RELOC/tex/latex/schule/tikz/usym1F4E3.tikz + RELOC/tex/latex/schule/tikz/usym1F4E4.tikz + RELOC/tex/latex/schule/tikz/usym1F4E5.tikz + RELOC/tex/latex/schule/tikz/usym1F4E6.tikz + RELOC/tex/latex/schule/tikz/usym1F4E7.tikz + RELOC/tex/latex/schule/tikz/usym1F4E8.tikz + RELOC/tex/latex/schule/tikz/usym1F4E9.tikz + RELOC/tex/latex/schule/tikz/usym1F4EA.tikz + RELOC/tex/latex/schule/tikz/usym1F4EB.tikz + RELOC/tex/latex/schule/tikz/usym1F4EC.tikz + RELOC/tex/latex/schule/tikz/usym1F4ED.tikz + RELOC/tex/latex/schule/tikz/usym1F4EE.tikz + RELOC/tex/latex/schule/tikz/usym1F4EF.tikz + RELOC/tex/latex/schule/tikz/usym1F4F0.tikz + RELOC/tex/latex/schule/tikz/usym1F4F1.tikz + RELOC/tex/latex/schule/tikz/usym1F4F2.tikz + RELOC/tex/latex/schule/tikz/usym1F4F3.tikz + RELOC/tex/latex/schule/tikz/usym1F4F4.tikz + RELOC/tex/latex/schule/tikz/usym1F4F5.tikz + RELOC/tex/latex/schule/tikz/usym1F4F6.tikz + RELOC/tex/latex/schule/tikz/usym1F4F7.tikz + RELOC/tex/latex/schule/tikz/usym1F4F8.tikz + RELOC/tex/latex/schule/tikz/usym1F4F9.tikz + RELOC/tex/latex/schule/tikz/usym1F4FA.tikz + RELOC/tex/latex/schule/tikz/usym1F4FB.tikz + RELOC/tex/latex/schule/tikz/usym1F4FC.tikz + RELOC/tex/latex/schule/tikz/usym1F4FD.tikz + RELOC/tex/latex/schule/tikz/usym1F4FE.tikz + RELOC/tex/latex/schule/tikz/usym1F4FF.tikz + RELOC/tex/latex/schule/tikz/usym1F500.tikz + RELOC/tex/latex/schule/tikz/usym1F501.tikz + RELOC/tex/latex/schule/tikz/usym1F502.tikz + RELOC/tex/latex/schule/tikz/usym1F503.tikz + RELOC/tex/latex/schule/tikz/usym1F504.tikz + RELOC/tex/latex/schule/tikz/usym1F505.tikz + RELOC/tex/latex/schule/tikz/usym1F506.tikz + RELOC/tex/latex/schule/tikz/usym1F507.tikz + RELOC/tex/latex/schule/tikz/usym1F508.tikz + RELOC/tex/latex/schule/tikz/usym1F509.tikz + RELOC/tex/latex/schule/tikz/usym1F50A.tikz + RELOC/tex/latex/schule/tikz/usym1F50B.tikz + RELOC/tex/latex/schule/tikz/usym1F50C.tikz + RELOC/tex/latex/schule/tikz/usym1F50D.tikz + RELOC/tex/latex/schule/tikz/usym1F50E.tikz + RELOC/tex/latex/schule/tikz/usym1F50F.tikz + RELOC/tex/latex/schule/tikz/usym1F510.tikz + RELOC/tex/latex/schule/tikz/usym1F511.tikz + RELOC/tex/latex/schule/tikz/usym1F512.tikz + RELOC/tex/latex/schule/tikz/usym1F513.tikz + RELOC/tex/latex/schule/tikz/usym1F514.tikz + RELOC/tex/latex/schule/tikz/usym1F515.tikz + RELOC/tex/latex/schule/tikz/usym1F516.tikz + RELOC/tex/latex/schule/tikz/usym1F517.tikz + RELOC/tex/latex/schule/tikz/usym1F518.tikz + RELOC/tex/latex/schule/tikz/usym1F519.tikz + RELOC/tex/latex/schule/tikz/usym1F51A.tikz + RELOC/tex/latex/schule/tikz/usym1F51B.tikz + RELOC/tex/latex/schule/tikz/usym1F51C.tikz + RELOC/tex/latex/schule/tikz/usym1F51D.tikz + RELOC/tex/latex/schule/tikz/usym1F51E.tikz + RELOC/tex/latex/schule/tikz/usym1F51F.tikz + RELOC/tex/latex/schule/tikz/usym1F520.tikz + RELOC/tex/latex/schule/tikz/usym1F521.tikz + RELOC/tex/latex/schule/tikz/usym1F522.tikz + RELOC/tex/latex/schule/tikz/usym1F523.tikz + RELOC/tex/latex/schule/tikz/usym1F524.tikz + RELOC/tex/latex/schule/tikz/usym1F525.tikz + RELOC/tex/latex/schule/tikz/usym1F526.tikz + RELOC/tex/latex/schule/tikz/usym1F527.tikz + RELOC/tex/latex/schule/tikz/usym1F528.tikz + RELOC/tex/latex/schule/tikz/usym1F529.tikz + RELOC/tex/latex/schule/tikz/usym1F52A.tikz + RELOC/tex/latex/schule/tikz/usym1F52B.tikz + RELOC/tex/latex/schule/tikz/usym1F52C.tikz + RELOC/tex/latex/schule/tikz/usym1F52D.tikz + RELOC/tex/latex/schule/tikz/usym1F52E.tikz + RELOC/tex/latex/schule/tikz/usym1F52F.tikz + RELOC/tex/latex/schule/tikz/usym1F530.tikz + RELOC/tex/latex/schule/tikz/usym1F531.tikz + RELOC/tex/latex/schule/tikz/usym1F532.tikz + RELOC/tex/latex/schule/tikz/usym1F533.tikz + RELOC/tex/latex/schule/tikz/usym1F534.tikz + RELOC/tex/latex/schule/tikz/usym1F535.tikz + RELOC/tex/latex/schule/tikz/usym1F536.tikz + RELOC/tex/latex/schule/tikz/usym1F537.tikz + RELOC/tex/latex/schule/tikz/usym1F538.tikz + RELOC/tex/latex/schule/tikz/usym1F539.tikz + RELOC/tex/latex/schule/tikz/usym1F53A.tikz + RELOC/tex/latex/schule/tikz/usym1F53B.tikz + RELOC/tex/latex/schule/tikz/usym1F53C.tikz + RELOC/tex/latex/schule/tikz/usym1F53D.tikz + RELOC/tex/latex/schule/tikz/usym1F53E.tikz + RELOC/tex/latex/schule/tikz/usym1F53F.tikz + RELOC/tex/latex/schule/tikz/usym1F540.tikz + RELOC/tex/latex/schule/tikz/usym1F541.tikz + RELOC/tex/latex/schule/tikz/usym1F542.tikz + RELOC/tex/latex/schule/tikz/usym1F543.tikz + RELOC/tex/latex/schule/tikz/usym1F544.tikz + RELOC/tex/latex/schule/tikz/usym1F545.tikz + RELOC/tex/latex/schule/tikz/usym1F546.tikz + RELOC/tex/latex/schule/tikz/usym1F547.tikz + RELOC/tex/latex/schule/tikz/usym1F548.tikz + RELOC/tex/latex/schule/tikz/usym1F549.tikz + RELOC/tex/latex/schule/tikz/usym1F54A.tikz + RELOC/tex/latex/schule/tikz/usym1F54B.tikz + RELOC/tex/latex/schule/tikz/usym1F54C.tikz + RELOC/tex/latex/schule/tikz/usym1F54D.tikz + RELOC/tex/latex/schule/tikz/usym1F54E.tikz + RELOC/tex/latex/schule/tikz/usym1F54F.tikz + RELOC/tex/latex/schule/tikz/usym1F550.tikz + RELOC/tex/latex/schule/tikz/usym1F551.tikz + RELOC/tex/latex/schule/tikz/usym1F552.tikz + RELOC/tex/latex/schule/tikz/usym1F553.tikz + RELOC/tex/latex/schule/tikz/usym1F554.tikz + RELOC/tex/latex/schule/tikz/usym1F555.tikz + RELOC/tex/latex/schule/tikz/usym1F556.tikz + RELOC/tex/latex/schule/tikz/usym1F557.tikz + RELOC/tex/latex/schule/tikz/usym1F558.tikz + RELOC/tex/latex/schule/tikz/usym1F559.tikz + RELOC/tex/latex/schule/tikz/usym1F55A.tikz + RELOC/tex/latex/schule/tikz/usym1F55B.tikz + RELOC/tex/latex/schule/tikz/usym1F55C.tikz + RELOC/tex/latex/schule/tikz/usym1F55D.tikz + RELOC/tex/latex/schule/tikz/usym1F55E.tikz + RELOC/tex/latex/schule/tikz/usym1F55F.tikz + RELOC/tex/latex/schule/tikz/usym1F560.tikz + RELOC/tex/latex/schule/tikz/usym1F561.tikz + RELOC/tex/latex/schule/tikz/usym1F562.tikz + RELOC/tex/latex/schule/tikz/usym1F563.tikz + RELOC/tex/latex/schule/tikz/usym1F564.tikz + RELOC/tex/latex/schule/tikz/usym1F565.tikz + RELOC/tex/latex/schule/tikz/usym1F566.tikz + RELOC/tex/latex/schule/tikz/usym1F567.tikz + RELOC/tex/latex/schule/tikz/usym1F568.tikz + RELOC/tex/latex/schule/tikz/usym1F569.tikz + RELOC/tex/latex/schule/tikz/usym1F56A.tikz + RELOC/tex/latex/schule/tikz/usym1F56B.tikz + RELOC/tex/latex/schule/tikz/usym1F56C.tikz + RELOC/tex/latex/schule/tikz/usym1F56D.tikz + RELOC/tex/latex/schule/tikz/usym1F56E.tikz + RELOC/tex/latex/schule/tikz/usym1F56F.tikz + RELOC/tex/latex/schule/tikz/usym1F570.tikz + RELOC/tex/latex/schule/tikz/usym1F571.tikz + RELOC/tex/latex/schule/tikz/usym1F572.tikz + RELOC/tex/latex/schule/tikz/usym1F573.tikz + RELOC/tex/latex/schule/tikz/usym1F574.tikz + RELOC/tex/latex/schule/tikz/usym1F575.tikz + RELOC/tex/latex/schule/tikz/usym1F576.tikz + RELOC/tex/latex/schule/tikz/usym1F577.tikz + RELOC/tex/latex/schule/tikz/usym1F578.tikz + RELOC/tex/latex/schule/tikz/usym1F579.tikz + RELOC/tex/latex/schule/tikz/usym1F57A.tikz + RELOC/tex/latex/schule/tikz/usym1F57B.tikz + RELOC/tex/latex/schule/tikz/usym1F57C.tikz + RELOC/tex/latex/schule/tikz/usym1F57D.tikz + RELOC/tex/latex/schule/tikz/usym1F57E.tikz + RELOC/tex/latex/schule/tikz/usym1F57F.tikz + RELOC/tex/latex/schule/tikz/usym1F580.tikz + RELOC/tex/latex/schule/tikz/usym1F581.tikz + RELOC/tex/latex/schule/tikz/usym1F582.tikz + RELOC/tex/latex/schule/tikz/usym1F583.tikz + RELOC/tex/latex/schule/tikz/usym1F584.tikz + RELOC/tex/latex/schule/tikz/usym1F585.tikz + RELOC/tex/latex/schule/tikz/usym1F586.tikz + RELOC/tex/latex/schule/tikz/usym1F587.tikz + RELOC/tex/latex/schule/tikz/usym1F588.tikz + RELOC/tex/latex/schule/tikz/usym1F589.tikz + RELOC/tex/latex/schule/tikz/usym1F58A.tikz + RELOC/tex/latex/schule/tikz/usym1F58B.tikz + RELOC/tex/latex/schule/tikz/usym1F58C.tikz + RELOC/tex/latex/schule/tikz/usym1F58D.tikz + RELOC/tex/latex/schule/tikz/usym1F58E.tikz + RELOC/tex/latex/schule/tikz/usym1F58F.tikz + RELOC/tex/latex/schule/tikz/usym1F590.tikz + RELOC/tex/latex/schule/tikz/usym1F591.tikz + RELOC/tex/latex/schule/tikz/usym1F592.tikz + RELOC/tex/latex/schule/tikz/usym1F593.tikz + RELOC/tex/latex/schule/tikz/usym1F594.tikz + RELOC/tex/latex/schule/tikz/usym1F595.tikz + RELOC/tex/latex/schule/tikz/usym1F596.tikz + RELOC/tex/latex/schule/tikz/usym1F597.tikz + RELOC/tex/latex/schule/tikz/usym1F598.tikz + RELOC/tex/latex/schule/tikz/usym1F599.tikz + RELOC/tex/latex/schule/tikz/usym1F59A.tikz + RELOC/tex/latex/schule/tikz/usym1F59B.tikz + RELOC/tex/latex/schule/tikz/usym1F59C.tikz + RELOC/tex/latex/schule/tikz/usym1F59D.tikz + RELOC/tex/latex/schule/tikz/usym1F59E.tikz + RELOC/tex/latex/schule/tikz/usym1F59F.tikz + RELOC/tex/latex/schule/tikz/usym1F5A0.tikz + RELOC/tex/latex/schule/tikz/usym1F5A1.tikz + RELOC/tex/latex/schule/tikz/usym1F5A2.tikz + RELOC/tex/latex/schule/tikz/usym1F5A3.tikz + RELOC/tex/latex/schule/tikz/usym1F5A4.tikz + RELOC/tex/latex/schule/tikz/usym1F5A5.tikz + RELOC/tex/latex/schule/tikz/usym1F5A6.tikz + RELOC/tex/latex/schule/tikz/usym1F5A7.tikz + RELOC/tex/latex/schule/tikz/usym1F5A8.tikz + RELOC/tex/latex/schule/tikz/usym1F5A9.tikz + RELOC/tex/latex/schule/tikz/usym1F5AA.tikz + RELOC/tex/latex/schule/tikz/usym1F5AB.tikz + RELOC/tex/latex/schule/tikz/usym1F5AC.tikz + RELOC/tex/latex/schule/tikz/usym1F5AD.tikz + RELOC/tex/latex/schule/tikz/usym1F5AE.tikz + RELOC/tex/latex/schule/tikz/usym1F5AF.tikz + RELOC/tex/latex/schule/tikz/usym1F5B0.tikz + RELOC/tex/latex/schule/tikz/usym1F5B1.tikz + RELOC/tex/latex/schule/tikz/usym1F5B2.tikz + RELOC/tex/latex/schule/tikz/usym1F5B3.tikz + RELOC/tex/latex/schule/tikz/usym1F5B4.tikz + RELOC/tex/latex/schule/tikz/usym1F5B5.tikz + RELOC/tex/latex/schule/tikz/usym1F5B6.tikz + RELOC/tex/latex/schule/tikz/usym1F5B7.tikz + RELOC/tex/latex/schule/tikz/usym1F5B8.tikz + RELOC/tex/latex/schule/tikz/usym1F5B9.tikz + RELOC/tex/latex/schule/tikz/usym1F5BA.tikz + RELOC/tex/latex/schule/tikz/usym1F5BB.tikz + RELOC/tex/latex/schule/tikz/usym1F5BC.tikz + RELOC/tex/latex/schule/tikz/usym1F5BD.tikz + RELOC/tex/latex/schule/tikz/usym1F5BE.tikz + RELOC/tex/latex/schule/tikz/usym1F5BF.tikz + RELOC/tex/latex/schule/tikz/usym1F5C0.tikz + RELOC/tex/latex/schule/tikz/usym1F5C1.tikz + RELOC/tex/latex/schule/tikz/usym1F5C2.tikz + RELOC/tex/latex/schule/tikz/usym1F5C3.tikz + RELOC/tex/latex/schule/tikz/usym1F5C4.tikz + RELOC/tex/latex/schule/tikz/usym1F5C5.tikz + RELOC/tex/latex/schule/tikz/usym1F5C6.tikz + RELOC/tex/latex/schule/tikz/usym1F5C7.tikz + RELOC/tex/latex/schule/tikz/usym1F5C8.tikz + RELOC/tex/latex/schule/tikz/usym1F5C9.tikz + RELOC/tex/latex/schule/tikz/usym1F5CA.tikz + RELOC/tex/latex/schule/tikz/usym1F5CB.tikz + RELOC/tex/latex/schule/tikz/usym1F5CC.tikz + RELOC/tex/latex/schule/tikz/usym1F5CD.tikz + RELOC/tex/latex/schule/tikz/usym1F5CE.tikz + RELOC/tex/latex/schule/tikz/usym1F5CF.tikz + RELOC/tex/latex/schule/tikz/usym1F5D0.tikz + RELOC/tex/latex/schule/tikz/usym1F5D1.tikz + RELOC/tex/latex/schule/tikz/usym1F5D2.tikz + RELOC/tex/latex/schule/tikz/usym1F5D3.tikz + RELOC/tex/latex/schule/tikz/usym1F5D4.tikz + RELOC/tex/latex/schule/tikz/usym1F5D5.tikz + RELOC/tex/latex/schule/tikz/usym1F5D6.tikz + RELOC/tex/latex/schule/tikz/usym1F5D7.tikz + RELOC/tex/latex/schule/tikz/usym1F5D8.tikz + RELOC/tex/latex/schule/tikz/usym1F5D9.tikz + RELOC/tex/latex/schule/tikz/usym1F5DA.tikz + RELOC/tex/latex/schule/tikz/usym1F5DB.tikz + RELOC/tex/latex/schule/tikz/usym1F5DC.tikz + RELOC/tex/latex/schule/tikz/usym1F5DD.tikz + RELOC/tex/latex/schule/tikz/usym1F5DE.tikz + RELOC/tex/latex/schule/tikz/usym1F5DF.tikz + RELOC/tex/latex/schule/tikz/usym1F5E0.tikz + RELOC/tex/latex/schule/tikz/usym1F5E1.tikz + RELOC/tex/latex/schule/tikz/usym1F5E2.tikz + RELOC/tex/latex/schule/tikz/usym1F5E3.tikz + RELOC/tex/latex/schule/tikz/usym1F5E4.tikz + RELOC/tex/latex/schule/tikz/usym1F5E5.tikz + RELOC/tex/latex/schule/tikz/usym1F5E6.tikz + RELOC/tex/latex/schule/tikz/usym1F5E7.tikz + RELOC/tex/latex/schule/tikz/usym1F5E8.tikz + RELOC/tex/latex/schule/tikz/usym1F5E9.tikz + RELOC/tex/latex/schule/tikz/usym1F5EA.tikz + RELOC/tex/latex/schule/tikz/usym1F5EB.tikz + RELOC/tex/latex/schule/tikz/usym1F5EC.tikz + RELOC/tex/latex/schule/tikz/usym1F5ED.tikz + RELOC/tex/latex/schule/tikz/usym1F5EE.tikz + RELOC/tex/latex/schule/tikz/usym1F5EF.tikz + RELOC/tex/latex/schule/tikz/usym1F5F0.tikz + RELOC/tex/latex/schule/tikz/usym1F5F1.tikz + RELOC/tex/latex/schule/tikz/usym1F5F2.tikz + RELOC/tex/latex/schule/tikz/usym1F5F3.tikz + RELOC/tex/latex/schule/tikz/usym1F5F4.tikz + RELOC/tex/latex/schule/tikz/usym1F5F5.tikz + RELOC/tex/latex/schule/tikz/usym1F5F6.tikz + RELOC/tex/latex/schule/tikz/usym1F5F7.tikz + RELOC/tex/latex/schule/tikz/usym1F5F8.tikz + RELOC/tex/latex/schule/tikz/usym1F5F9.tikz + RELOC/tex/latex/schule/tikz/usym1F5FA.tikz + RELOC/tex/latex/schule/tikz/usym1F5FB.tikz + RELOC/tex/latex/schule/tikz/usym1F5FC.tikz + RELOC/tex/latex/schule/tikz/usym1F5FD.tikz + RELOC/tex/latex/schule/tikz/usym1F5FE.tikz + RELOC/tex/latex/schule/tikz/usym1F5FF.tikz + RELOC/tex/latex/schule/tikz/usym1F600.tikz + RELOC/tex/latex/schule/tikz/usym1F601.tikz + RELOC/tex/latex/schule/tikz/usym1F602.tikz + RELOC/tex/latex/schule/tikz/usym1F603.tikz + RELOC/tex/latex/schule/tikz/usym1F604.tikz + RELOC/tex/latex/schule/tikz/usym1F605.tikz + RELOC/tex/latex/schule/tikz/usym1F606.tikz + RELOC/tex/latex/schule/tikz/usym1F607.tikz + RELOC/tex/latex/schule/tikz/usym1F608.tikz + RELOC/tex/latex/schule/tikz/usym1F609.tikz + RELOC/tex/latex/schule/tikz/usym1F60A.tikz + RELOC/tex/latex/schule/tikz/usym1F60B.tikz + RELOC/tex/latex/schule/tikz/usym1F60C.tikz + RELOC/tex/latex/schule/tikz/usym1F60D.tikz + RELOC/tex/latex/schule/tikz/usym1F60E.tikz + RELOC/tex/latex/schule/tikz/usym1F60F.tikz + RELOC/tex/latex/schule/tikz/usym1F610.tikz + RELOC/tex/latex/schule/tikz/usym1F611.tikz + RELOC/tex/latex/schule/tikz/usym1F612.tikz + RELOC/tex/latex/schule/tikz/usym1F613.tikz + RELOC/tex/latex/schule/tikz/usym1F614.tikz + RELOC/tex/latex/schule/tikz/usym1F615.tikz + RELOC/tex/latex/schule/tikz/usym1F616.tikz + RELOC/tex/latex/schule/tikz/usym1F617.tikz + RELOC/tex/latex/schule/tikz/usym1F618.tikz + RELOC/tex/latex/schule/tikz/usym1F619.tikz + RELOC/tex/latex/schule/tikz/usym1F61A.tikz + RELOC/tex/latex/schule/tikz/usym1F61B.tikz + RELOC/tex/latex/schule/tikz/usym1F61C.tikz + RELOC/tex/latex/schule/tikz/usym1F61D.tikz + RELOC/tex/latex/schule/tikz/usym1F61E.tikz + RELOC/tex/latex/schule/tikz/usym1F61F.tikz + RELOC/tex/latex/schule/tikz/usym1F620.tikz + RELOC/tex/latex/schule/tikz/usym1F621.tikz + RELOC/tex/latex/schule/tikz/usym1F622.tikz + RELOC/tex/latex/schule/tikz/usym1F623.tikz + RELOC/tex/latex/schule/tikz/usym1F624.tikz + RELOC/tex/latex/schule/tikz/usym1F625.tikz + RELOC/tex/latex/schule/tikz/usym1F626.tikz + RELOC/tex/latex/schule/tikz/usym1F627.tikz + RELOC/tex/latex/schule/tikz/usym1F628.tikz + RELOC/tex/latex/schule/tikz/usym1F629.tikz + RELOC/tex/latex/schule/tikz/usym1F62A.tikz + RELOC/tex/latex/schule/tikz/usym1F62B.tikz + RELOC/tex/latex/schule/tikz/usym1F62C.tikz + RELOC/tex/latex/schule/tikz/usym1F62D.tikz + RELOC/tex/latex/schule/tikz/usym1F62E.tikz + RELOC/tex/latex/schule/tikz/usym1F62F.tikz + RELOC/tex/latex/schule/tikz/usym1F630.tikz + RELOC/tex/latex/schule/tikz/usym1F631.tikz + RELOC/tex/latex/schule/tikz/usym1F632.tikz + RELOC/tex/latex/schule/tikz/usym1F633.tikz + RELOC/tex/latex/schule/tikz/usym1F634.tikz + RELOC/tex/latex/schule/tikz/usym1F635.tikz + RELOC/tex/latex/schule/tikz/usym1F636.tikz + RELOC/tex/latex/schule/tikz/usym1F637.tikz + RELOC/tex/latex/schule/tikz/usym1F638.tikz + RELOC/tex/latex/schule/tikz/usym1F639.tikz + RELOC/tex/latex/schule/tikz/usym1F63A.tikz + RELOC/tex/latex/schule/tikz/usym1F63B.tikz + RELOC/tex/latex/schule/tikz/usym1F63C.tikz + RELOC/tex/latex/schule/tikz/usym1F63D.tikz + RELOC/tex/latex/schule/tikz/usym1F63E.tikz + RELOC/tex/latex/schule/tikz/usym1F63F.tikz + RELOC/tex/latex/schule/tikz/usym1F640.tikz + RELOC/tex/latex/schule/tikz/usym1F641.tikz + RELOC/tex/latex/schule/tikz/usym1F642.tikz + RELOC/tex/latex/schule/tikz/usym1F643.tikz + RELOC/tex/latex/schule/tikz/usym1F644.tikz + RELOC/tex/latex/schule/tikz/usym1F645.tikz + RELOC/tex/latex/schule/tikz/usym1F646.tikz + RELOC/tex/latex/schule/tikz/usym1F647.tikz + RELOC/tex/latex/schule/tikz/usym1F648.tikz + RELOC/tex/latex/schule/tikz/usym1F649.tikz + RELOC/tex/latex/schule/tikz/usym1F64A.tikz + RELOC/tex/latex/schule/tikz/usym1F64B.tikz + RELOC/tex/latex/schule/tikz/usym1F64C.tikz + RELOC/tex/latex/schule/tikz/usym1F64D.tikz + RELOC/tex/latex/schule/tikz/usym1F64E.tikz + RELOC/tex/latex/schule/tikz/usym1F64F.tikz + RELOC/tex/latex/schule/tikz/usym1F680.tikz + RELOC/tex/latex/schule/tikz/usym1F681.tikz + RELOC/tex/latex/schule/tikz/usym1F682.tikz + RELOC/tex/latex/schule/tikz/usym1F683.tikz + RELOC/tex/latex/schule/tikz/usym1F684.tikz + RELOC/tex/latex/schule/tikz/usym1F685.tikz + RELOC/tex/latex/schule/tikz/usym1F686.tikz + RELOC/tex/latex/schule/tikz/usym1F687.tikz + RELOC/tex/latex/schule/tikz/usym1F688.tikz + RELOC/tex/latex/schule/tikz/usym1F689.tikz + RELOC/tex/latex/schule/tikz/usym1F68A.tikz + RELOC/tex/latex/schule/tikz/usym1F68B.tikz + RELOC/tex/latex/schule/tikz/usym1F68C.tikz + RELOC/tex/latex/schule/tikz/usym1F68D.tikz + RELOC/tex/latex/schule/tikz/usym1F68E.tikz + RELOC/tex/latex/schule/tikz/usym1F68F.tikz + RELOC/tex/latex/schule/tikz/usym1F690.tikz + RELOC/tex/latex/schule/tikz/usym1F691.tikz + RELOC/tex/latex/schule/tikz/usym1F692.tikz + RELOC/tex/latex/schule/tikz/usym1F693.tikz + RELOC/tex/latex/schule/tikz/usym1F694.tikz + RELOC/tex/latex/schule/tikz/usym1F695.tikz + RELOC/tex/latex/schule/tikz/usym1F696.tikz + RELOC/tex/latex/schule/tikz/usym1F697.tikz + RELOC/tex/latex/schule/tikz/usym1F698.tikz + RELOC/tex/latex/schule/tikz/usym1F699.tikz + RELOC/tex/latex/schule/tikz/usym1F69A.tikz + RELOC/tex/latex/schule/tikz/usym1F69B.tikz + RELOC/tex/latex/schule/tikz/usym1F69C.tikz + RELOC/tex/latex/schule/tikz/usym1F69D.tikz + RELOC/tex/latex/schule/tikz/usym1F69E.tikz + RELOC/tex/latex/schule/tikz/usym1F69F.tikz + RELOC/tex/latex/schule/tikz/usym1F6A0.tikz + RELOC/tex/latex/schule/tikz/usym1F6A1.tikz + RELOC/tex/latex/schule/tikz/usym1F6A2.tikz + RELOC/tex/latex/schule/tikz/usym1F6A3.tikz + RELOC/tex/latex/schule/tikz/usym1F6A4.tikz + RELOC/tex/latex/schule/tikz/usym1F6A5.tikz + RELOC/tex/latex/schule/tikz/usym1F6A6.tikz + RELOC/tex/latex/schule/tikz/usym1F6A7.tikz + RELOC/tex/latex/schule/tikz/usym1F6A8.tikz + RELOC/tex/latex/schule/tikz/usym1F6A9.tikz + RELOC/tex/latex/schule/tikz/usym1F6AA.tikz + RELOC/tex/latex/schule/tikz/usym1F6AB.tikz + RELOC/tex/latex/schule/tikz/usym1F6AC.tikz + RELOC/tex/latex/schule/tikz/usym1F6AD.tikz + RELOC/tex/latex/schule/tikz/usym1F6AE.tikz + RELOC/tex/latex/schule/tikz/usym1F6AF.tikz + RELOC/tex/latex/schule/tikz/usym1F6B0.tikz + RELOC/tex/latex/schule/tikz/usym1F6B1.tikz + RELOC/tex/latex/schule/tikz/usym1F6B2.tikz + RELOC/tex/latex/schule/tikz/usym1F6B3.tikz + RELOC/tex/latex/schule/tikz/usym1F6B4.tikz + RELOC/tex/latex/schule/tikz/usym1F6B5.tikz + RELOC/tex/latex/schule/tikz/usym1F6B6.tikz + RELOC/tex/latex/schule/tikz/usym1F6B7.tikz + RELOC/tex/latex/schule/tikz/usym1F6B8.tikz + RELOC/tex/latex/schule/tikz/usym1F6B9.tikz + RELOC/tex/latex/schule/tikz/usym1F6BA.tikz + RELOC/tex/latex/schule/tikz/usym1F6BB.tikz + RELOC/tex/latex/schule/tikz/usym1F6BC.tikz + RELOC/tex/latex/schule/tikz/usym1F6BD.tikz + RELOC/tex/latex/schule/tikz/usym1F6BE.tikz + RELOC/tex/latex/schule/tikz/usym1F6BF.tikz + RELOC/tex/latex/schule/tikz/usym1F6C0.tikz + RELOC/tex/latex/schule/tikz/usym1F6C1.tikz + RELOC/tex/latex/schule/tikz/usym1F6C2.tikz + RELOC/tex/latex/schule/tikz/usym1F6C3.tikz + RELOC/tex/latex/schule/tikz/usym1F6C4.tikz + RELOC/tex/latex/schule/tikz/usym1F6C5.tikz + RELOC/tex/latex/schule/tikz/usym1F6C6.tikz + RELOC/tex/latex/schule/tikz/usym1F6C7.tikz + RELOC/tex/latex/schule/tikz/usym1F6C8.tikz + RELOC/tex/latex/schule/tikz/usym1F6C9.tikz + RELOC/tex/latex/schule/tikz/usym1F6CA.tikz + RELOC/tex/latex/schule/tikz/usym1F6CB.tikz + RELOC/tex/latex/schule/tikz/usym1F6CC.tikz + RELOC/tex/latex/schule/tikz/usym1F6CD.tikz + RELOC/tex/latex/schule/tikz/usym1F6CE.tikz + RELOC/tex/latex/schule/tikz/usym1F6CF.tikz + RELOC/tex/latex/schule/tikz/usym1F6D0.tikz + RELOC/tex/latex/schule/tikz/usym1F6D1.tikz + RELOC/tex/latex/schule/tikz/usym1F6D2.tikz + RELOC/tex/latex/schule/tikz/usym1F6D3.tikz + RELOC/tex/latex/schule/tikz/usym1F6D4.tikz + RELOC/tex/latex/schule/tikz/usym1F6D5.tikz + RELOC/tex/latex/schule/tikz/usym1F6D6.tikz + RELOC/tex/latex/schule/tikz/usym1F6D7.tikz + RELOC/tex/latex/schule/tikz/usym1F6D8.tikz + RELOC/tex/latex/schule/tikz/usym1F6D9.tikz + RELOC/tex/latex/schule/tikz/usym1F6DA.tikz + RELOC/tex/latex/schule/tikz/usym1F6DB.tikz + RELOC/tex/latex/schule/tikz/usym1F6DC.tikz + RELOC/tex/latex/schule/tikz/usym1F6DD.tikz + RELOC/tex/latex/schule/tikz/usym1F6DE.tikz + RELOC/tex/latex/schule/tikz/usym1F6DF.tikz + RELOC/tex/latex/schule/tikz/usym1F6E0.tikz + RELOC/tex/latex/schule/tikz/usym1F6E1.tikz + RELOC/tex/latex/schule/tikz/usym1F6E2.tikz + RELOC/tex/latex/schule/tikz/usym1F6E3.tikz + RELOC/tex/latex/schule/tikz/usym1F6E4.tikz + RELOC/tex/latex/schule/tikz/usym1F6E5.tikz + RELOC/tex/latex/schule/tikz/usym1F6E6.tikz + RELOC/tex/latex/schule/tikz/usym1F6E7.tikz + RELOC/tex/latex/schule/tikz/usym1F6E8.tikz + RELOC/tex/latex/schule/tikz/usym1F6E9.tikz + RELOC/tex/latex/schule/tikz/usym1F6EA.tikz + RELOC/tex/latex/schule/tikz/usym1F6EB.tikz + RELOC/tex/latex/schule/tikz/usym1F6EC.tikz + RELOC/tex/latex/schule/tikz/usym1F6ED.tikz + RELOC/tex/latex/schule/tikz/usym1F6EE.tikz + RELOC/tex/latex/schule/tikz/usym1F6EF.tikz + RELOC/tex/latex/schule/tikz/usym1F6F0.tikz + RELOC/tex/latex/schule/tikz/usym1F6F1.tikz + RELOC/tex/latex/schule/tikz/usym1F6F2.tikz + RELOC/tex/latex/schule/tikz/usym1F6F3.tikz + RELOC/tex/latex/schule/tikz/usym1F6F4.tikz + RELOC/tex/latex/schule/tikz/usym1F6F5.tikz + RELOC/tex/latex/schule/tikz/usym1F6F6.tikz + RELOC/tex/latex/schule/tikz/usym1F6F7.tikz + RELOC/tex/latex/schule/tikz/usym1F6F8.tikz + RELOC/tex/latex/schule/tikz/usym1F6F9.tikz + RELOC/tex/latex/schule/tikz/usym1F6FA.tikz + RELOC/tex/latex/schule/tikz/usym1F6FB.tikz + RELOC/tex/latex/schule/tikz/usym1F6FC.tikz + RELOC/tex/latex/schule/tikz/usym1F6FD.tikz + RELOC/tex/latex/schule/tikz/usym1F6FE.tikz + RELOC/tex/latex/schule/tikz/usym1F6FF.tikz + RELOC/tex/latex/schule/tikz/usym2600.tikz + RELOC/tex/latex/schule/tikz/usym2601.tikz + RELOC/tex/latex/schule/tikz/usym2602.tikz + RELOC/tex/latex/schule/tikz/usym2603.tikz + RELOC/tex/latex/schule/tikz/usym2604.tikz + RELOC/tex/latex/schule/tikz/usym2605.tikz + RELOC/tex/latex/schule/tikz/usym2606.tikz + RELOC/tex/latex/schule/tikz/usym2607.tikz + RELOC/tex/latex/schule/tikz/usym2608.tikz + RELOC/tex/latex/schule/tikz/usym2609.tikz + RELOC/tex/latex/schule/tikz/usym260A.tikz + RELOC/tex/latex/schule/tikz/usym260B.tikz + RELOC/tex/latex/schule/tikz/usym260C.tikz + RELOC/tex/latex/schule/tikz/usym260D.tikz + RELOC/tex/latex/schule/tikz/usym260E.tikz + RELOC/tex/latex/schule/tikz/usym260F.tikz + RELOC/tex/latex/schule/tikz/usym2610.tikz + RELOC/tex/latex/schule/tikz/usym2611.tikz + RELOC/tex/latex/schule/tikz/usym2612.tikz + RELOC/tex/latex/schule/tikz/usym2613.tikz + RELOC/tex/latex/schule/tikz/usym2614.tikz + RELOC/tex/latex/schule/tikz/usym2615.tikz + RELOC/tex/latex/schule/tikz/usym2616.tikz + RELOC/tex/latex/schule/tikz/usym2617.tikz + RELOC/tex/latex/schule/tikz/usym2618.tikz + RELOC/tex/latex/schule/tikz/usym2619.tikz + RELOC/tex/latex/schule/tikz/usym261A.tikz + RELOC/tex/latex/schule/tikz/usym261B.tikz + RELOC/tex/latex/schule/tikz/usym261C.tikz + RELOC/tex/latex/schule/tikz/usym261D.tikz + RELOC/tex/latex/schule/tikz/usym261E.tikz + RELOC/tex/latex/schule/tikz/usym261F.tikz + RELOC/tex/latex/schule/tikz/usym2620.tikz + RELOC/tex/latex/schule/tikz/usym2621.tikz + RELOC/tex/latex/schule/tikz/usym2622.tikz + RELOC/tex/latex/schule/tikz/usym2623.tikz + RELOC/tex/latex/schule/tikz/usym2624.tikz + RELOC/tex/latex/schule/tikz/usym2625.tikz + RELOC/tex/latex/schule/tikz/usym2626.tikz + RELOC/tex/latex/schule/tikz/usym2627.tikz + RELOC/tex/latex/schule/tikz/usym2628.tikz + RELOC/tex/latex/schule/tikz/usym2629.tikz + RELOC/tex/latex/schule/tikz/usym262A.tikz + RELOC/tex/latex/schule/tikz/usym262B.tikz + RELOC/tex/latex/schule/tikz/usym262C.tikz + RELOC/tex/latex/schule/tikz/usym262D.tikz + RELOC/tex/latex/schule/tikz/usym262E.tikz + RELOC/tex/latex/schule/tikz/usym262F.tikz + RELOC/tex/latex/schule/tikz/usym2630.tikz + RELOC/tex/latex/schule/tikz/usym2631.tikz + RELOC/tex/latex/schule/tikz/usym2632.tikz + RELOC/tex/latex/schule/tikz/usym2633.tikz + RELOC/tex/latex/schule/tikz/usym2634.tikz + RELOC/tex/latex/schule/tikz/usym2635.tikz + RELOC/tex/latex/schule/tikz/usym2636.tikz + RELOC/tex/latex/schule/tikz/usym2637.tikz + RELOC/tex/latex/schule/tikz/usym2638.tikz + RELOC/tex/latex/schule/tikz/usym2639.tikz + RELOC/tex/latex/schule/tikz/usym263A.tikz + RELOC/tex/latex/schule/tikz/usym263B.tikz + RELOC/tex/latex/schule/tikz/usym263C.tikz + RELOC/tex/latex/schule/tikz/usym263D.tikz + RELOC/tex/latex/schule/tikz/usym263E.tikz + RELOC/tex/latex/schule/tikz/usym263F.tikz + RELOC/tex/latex/schule/tikz/usym2640.tikz + RELOC/tex/latex/schule/tikz/usym2641.tikz + RELOC/tex/latex/schule/tikz/usym2642.tikz + RELOC/tex/latex/schule/tikz/usym2643.tikz + RELOC/tex/latex/schule/tikz/usym2644.tikz + RELOC/tex/latex/schule/tikz/usym2645.tikz + RELOC/tex/latex/schule/tikz/usym2646.tikz + RELOC/tex/latex/schule/tikz/usym2647.tikz + RELOC/tex/latex/schule/tikz/usym2648.tikz + RELOC/tex/latex/schule/tikz/usym2649.tikz + RELOC/tex/latex/schule/tikz/usym264A.tikz + RELOC/tex/latex/schule/tikz/usym264B.tikz + RELOC/tex/latex/schule/tikz/usym264C.tikz + RELOC/tex/latex/schule/tikz/usym264D.tikz + RELOC/tex/latex/schule/tikz/usym264E.tikz + RELOC/tex/latex/schule/tikz/usym264F.tikz + RELOC/tex/latex/schule/tikz/usym2650.tikz + RELOC/tex/latex/schule/tikz/usym2651.tikz + RELOC/tex/latex/schule/tikz/usym2652.tikz + RELOC/tex/latex/schule/tikz/usym2653.tikz + RELOC/tex/latex/schule/tikz/usym2654.tikz + RELOC/tex/latex/schule/tikz/usym2655.tikz + RELOC/tex/latex/schule/tikz/usym2656.tikz + RELOC/tex/latex/schule/tikz/usym2657.tikz + RELOC/tex/latex/schule/tikz/usym2658.tikz + RELOC/tex/latex/schule/tikz/usym2659.tikz + RELOC/tex/latex/schule/tikz/usym265A.tikz + RELOC/tex/latex/schule/tikz/usym265B.tikz + RELOC/tex/latex/schule/tikz/usym265C.tikz + RELOC/tex/latex/schule/tikz/usym265D.tikz + RELOC/tex/latex/schule/tikz/usym265E.tikz + RELOC/tex/latex/schule/tikz/usym265F.tikz + RELOC/tex/latex/schule/tikz/usym2660.tikz + RELOC/tex/latex/schule/tikz/usym2661.tikz + RELOC/tex/latex/schule/tikz/usym2662.tikz + RELOC/tex/latex/schule/tikz/usym2663.tikz + RELOC/tex/latex/schule/tikz/usym2664.tikz + RELOC/tex/latex/schule/tikz/usym2665.tikz + RELOC/tex/latex/schule/tikz/usym2666.tikz + RELOC/tex/latex/schule/tikz/usym2667.tikz + RELOC/tex/latex/schule/tikz/usym2668.tikz + RELOC/tex/latex/schule/tikz/usym2669.tikz + RELOC/tex/latex/schule/tikz/usym266A.tikz + RELOC/tex/latex/schule/tikz/usym266B.tikz + RELOC/tex/latex/schule/tikz/usym266C.tikz + RELOC/tex/latex/schule/tikz/usym266D.tikz + RELOC/tex/latex/schule/tikz/usym266E.tikz + RELOC/tex/latex/schule/tikz/usym266F.tikz + RELOC/tex/latex/schule/tikz/usym2670.tikz + RELOC/tex/latex/schule/tikz/usym2671.tikz + RELOC/tex/latex/schule/tikz/usym2672.tikz + RELOC/tex/latex/schule/tikz/usym2673.tikz + RELOC/tex/latex/schule/tikz/usym2674.tikz + RELOC/tex/latex/schule/tikz/usym2675.tikz + RELOC/tex/latex/schule/tikz/usym2676.tikz + RELOC/tex/latex/schule/tikz/usym2677.tikz + RELOC/tex/latex/schule/tikz/usym2678.tikz + RELOC/tex/latex/schule/tikz/usym2679.tikz + RELOC/tex/latex/schule/tikz/usym267A.tikz + RELOC/tex/latex/schule/tikz/usym267B.tikz + RELOC/tex/latex/schule/tikz/usym267C.tikz + RELOC/tex/latex/schule/tikz/usym267D.tikz + RELOC/tex/latex/schule/tikz/usym267E.tikz + RELOC/tex/latex/schule/tikz/usym267F.tikz + RELOC/tex/latex/schule/tikz/usym2680.tikz + RELOC/tex/latex/schule/tikz/usym2681.tikz + RELOC/tex/latex/schule/tikz/usym2682.tikz + RELOC/tex/latex/schule/tikz/usym2683.tikz + RELOC/tex/latex/schule/tikz/usym2684.tikz + RELOC/tex/latex/schule/tikz/usym2685.tikz + RELOC/tex/latex/schule/tikz/usym2686.tikz + RELOC/tex/latex/schule/tikz/usym2687.tikz + RELOC/tex/latex/schule/tikz/usym2688.tikz + RELOC/tex/latex/schule/tikz/usym2689.tikz + RELOC/tex/latex/schule/tikz/usym268A.tikz + RELOC/tex/latex/schule/tikz/usym268B.tikz + RELOC/tex/latex/schule/tikz/usym268C.tikz + RELOC/tex/latex/schule/tikz/usym268D.tikz + RELOC/tex/latex/schule/tikz/usym268E.tikz + RELOC/tex/latex/schule/tikz/usym268F.tikz + RELOC/tex/latex/schule/tikz/usym2690.tikz + RELOC/tex/latex/schule/tikz/usym2691.tikz + RELOC/tex/latex/schule/tikz/usym2692.tikz + RELOC/tex/latex/schule/tikz/usym2693.tikz + RELOC/tex/latex/schule/tikz/usym2694.tikz + RELOC/tex/latex/schule/tikz/usym2695.tikz + RELOC/tex/latex/schule/tikz/usym2696.tikz + RELOC/tex/latex/schule/tikz/usym2697.tikz + RELOC/tex/latex/schule/tikz/usym2698.tikz + RELOC/tex/latex/schule/tikz/usym2699.tikz + RELOC/tex/latex/schule/tikz/usym269A.tikz + RELOC/tex/latex/schule/tikz/usym269B.tikz + RELOC/tex/latex/schule/tikz/usym269C.tikz + RELOC/tex/latex/schule/tikz/usym269D.tikz + RELOC/tex/latex/schule/tikz/usym269E.tikz + RELOC/tex/latex/schule/tikz/usym269F.tikz + RELOC/tex/latex/schule/tikz/usym26A0.tikz + RELOC/tex/latex/schule/tikz/usym26A1.tikz + RELOC/tex/latex/schule/tikz/usym26A2.tikz + RELOC/tex/latex/schule/tikz/usym26A3.tikz + RELOC/tex/latex/schule/tikz/usym26A4.tikz + RELOC/tex/latex/schule/tikz/usym26A5.tikz + RELOC/tex/latex/schule/tikz/usym26A6.tikz + RELOC/tex/latex/schule/tikz/usym26A7.tikz + RELOC/tex/latex/schule/tikz/usym26A8.tikz + RELOC/tex/latex/schule/tikz/usym26A9.tikz + RELOC/tex/latex/schule/tikz/usym26AA.tikz + RELOC/tex/latex/schule/tikz/usym26AB.tikz + RELOC/tex/latex/schule/tikz/usym26AC.tikz + RELOC/tex/latex/schule/tikz/usym26AD.tikz + RELOC/tex/latex/schule/tikz/usym26AE.tikz + RELOC/tex/latex/schule/tikz/usym26AF.tikz + RELOC/tex/latex/schule/tikz/usym26B0.tikz + RELOC/tex/latex/schule/tikz/usym26B1.tikz + RELOC/tex/latex/schule/tikz/usym26B2.tikz + RELOC/tex/latex/schule/tikz/usym26B3.tikz + RELOC/tex/latex/schule/tikz/usym26B4.tikz + RELOC/tex/latex/schule/tikz/usym26B5.tikz + RELOC/tex/latex/schule/tikz/usym26B6.tikz + RELOC/tex/latex/schule/tikz/usym26B7.tikz + RELOC/tex/latex/schule/tikz/usym26B8.tikz + RELOC/tex/latex/schule/tikz/usym26B9.tikz + RELOC/tex/latex/schule/tikz/usym26BA.tikz + RELOC/tex/latex/schule/tikz/usym26BB.tikz + RELOC/tex/latex/schule/tikz/usym26BC.tikz + RELOC/tex/latex/schule/tikz/usym26BD.tikz + RELOC/tex/latex/schule/tikz/usym26BE.tikz + RELOC/tex/latex/schule/tikz/usym26BF.tikz + RELOC/tex/latex/schule/tikz/usym26C0.tikz + RELOC/tex/latex/schule/tikz/usym26C1.tikz + RELOC/tex/latex/schule/tikz/usym26C2.tikz + RELOC/tex/latex/schule/tikz/usym26C3.tikz + RELOC/tex/latex/schule/tikz/usym26C4.tikz + RELOC/tex/latex/schule/tikz/usym26C5.tikz + RELOC/tex/latex/schule/tikz/usym26C6.tikz + RELOC/tex/latex/schule/tikz/usym26C7.tikz + RELOC/tex/latex/schule/tikz/usym26C8.tikz + RELOC/tex/latex/schule/tikz/usym26C9.tikz + RELOC/tex/latex/schule/tikz/usym26CA.tikz + RELOC/tex/latex/schule/tikz/usym26CB.tikz + RELOC/tex/latex/schule/tikz/usym26CC.tikz + RELOC/tex/latex/schule/tikz/usym26CD.tikz + RELOC/tex/latex/schule/tikz/usym26CE.tikz + RELOC/tex/latex/schule/tikz/usym26CF.tikz + RELOC/tex/latex/schule/tikz/usym26D0.tikz + RELOC/tex/latex/schule/tikz/usym26D1.tikz + RELOC/tex/latex/schule/tikz/usym26D2.tikz + RELOC/tex/latex/schule/tikz/usym26D3.tikz + RELOC/tex/latex/schule/tikz/usym26D4.tikz + RELOC/tex/latex/schule/tikz/usym26D5.tikz + RELOC/tex/latex/schule/tikz/usym26D6.tikz + RELOC/tex/latex/schule/tikz/usym26D7.tikz + RELOC/tex/latex/schule/tikz/usym26D8.tikz + RELOC/tex/latex/schule/tikz/usym26D9.tikz + RELOC/tex/latex/schule/tikz/usym26DA.tikz + RELOC/tex/latex/schule/tikz/usym26DB.tikz + RELOC/tex/latex/schule/tikz/usym26DC.tikz + RELOC/tex/latex/schule/tikz/usym26DD.tikz + RELOC/tex/latex/schule/tikz/usym26DE.tikz + RELOC/tex/latex/schule/tikz/usym26DF.tikz + RELOC/tex/latex/schule/tikz/usym26E0.tikz + RELOC/tex/latex/schule/tikz/usym26E1.tikz + RELOC/tex/latex/schule/tikz/usym26E2.tikz + RELOC/tex/latex/schule/tikz/usym26E3.tikz + RELOC/tex/latex/schule/tikz/usym26E4.tikz + RELOC/tex/latex/schule/tikz/usym26E5.tikz + RELOC/tex/latex/schule/tikz/usym26E6.tikz + RELOC/tex/latex/schule/tikz/usym26E7.tikz + RELOC/tex/latex/schule/tikz/usym26E8.tikz + RELOC/tex/latex/schule/tikz/usym26E9.tikz + RELOC/tex/latex/schule/tikz/usym26EA.tikz + RELOC/tex/latex/schule/tikz/usym26EB.tikz + RELOC/tex/latex/schule/tikz/usym26EC.tikz + RELOC/tex/latex/schule/tikz/usym26ED.tikz + RELOC/tex/latex/schule/tikz/usym26EE.tikz + RELOC/tex/latex/schule/tikz/usym26EF.tikz + RELOC/tex/latex/schule/tikz/usym26F0.tikz + RELOC/tex/latex/schule/tikz/usym26F1.tikz + RELOC/tex/latex/schule/tikz/usym26F2.tikz + RELOC/tex/latex/schule/tikz/usym26F3.tikz + RELOC/tex/latex/schule/tikz/usym26F4.tikz + RELOC/tex/latex/schule/tikz/usym26F5.tikz + RELOC/tex/latex/schule/tikz/usym26F6.tikz + RELOC/tex/latex/schule/tikz/usym26F7.tikz + RELOC/tex/latex/schule/tikz/usym26F8.tikz + RELOC/tex/latex/schule/tikz/usym26F9.tikz + RELOC/tex/latex/schule/tikz/usym26FA.tikz + RELOC/tex/latex/schule/tikz/usym26FB.tikz + RELOC/tex/latex/schule/tikz/usym26FC.tikz + RELOC/tex/latex/schule/tikz/usym26FD.tikz + RELOC/tex/latex/schule/tikz/usym26FE.tikz + RELOC/tex/latex/schule/tikz/usym26FF.tikz + RELOC/tex/latex/schule/tikz/usym2700.tikz + RELOC/tex/latex/schule/tikz/usym2701.tikz + RELOC/tex/latex/schule/tikz/usym2702.tikz + RELOC/tex/latex/schule/tikz/usym2703.tikz + RELOC/tex/latex/schule/tikz/usym2704.tikz + RELOC/tex/latex/schule/tikz/usym2705.tikz + RELOC/tex/latex/schule/tikz/usym2706.tikz + RELOC/tex/latex/schule/tikz/usym2707.tikz + RELOC/tex/latex/schule/tikz/usym2708.tikz + RELOC/tex/latex/schule/tikz/usym2709.tikz + RELOC/tex/latex/schule/tikz/usym270A.tikz + RELOC/tex/latex/schule/tikz/usym270B.tikz + RELOC/tex/latex/schule/tikz/usym270C.tikz + RELOC/tex/latex/schule/tikz/usym270D.tikz + RELOC/tex/latex/schule/tikz/usym270E.tikz + RELOC/tex/latex/schule/tikz/usym270F.tikz + RELOC/tex/latex/schule/tikz/usym2710.tikz + RELOC/tex/latex/schule/tikz/usym2711.tikz + RELOC/tex/latex/schule/tikz/usym2712.tikz + RELOC/tex/latex/schule/tikz/usym2713.tikz + RELOC/tex/latex/schule/tikz/usym2714.tikz + RELOC/tex/latex/schule/tikz/usym2715.tikz + RELOC/tex/latex/schule/tikz/usym2716.tikz + RELOC/tex/latex/schule/tikz/usym2717.tikz + RELOC/tex/latex/schule/tikz/usym2718.tikz + RELOC/tex/latex/schule/tikz/usym2719.tikz + RELOC/tex/latex/schule/tikz/usym271A.tikz + RELOC/tex/latex/schule/tikz/usym271B.tikz + RELOC/tex/latex/schule/tikz/usym271C.tikz + RELOC/tex/latex/schule/tikz/usym271D.tikz + RELOC/tex/latex/schule/tikz/usym271E.tikz + RELOC/tex/latex/schule/tikz/usym271F.tikz + RELOC/tex/latex/schule/tikz/usym2720.tikz + RELOC/tex/latex/schule/tikz/usym2721.tikz + RELOC/tex/latex/schule/tikz/usym2722.tikz + RELOC/tex/latex/schule/tikz/usym2723.tikz + RELOC/tex/latex/schule/tikz/usym2724.tikz + RELOC/tex/latex/schule/tikz/usym2725.tikz + RELOC/tex/latex/schule/tikz/usym2726.tikz + RELOC/tex/latex/schule/tikz/usym2727.tikz + RELOC/tex/latex/schule/tikz/usym2728.tikz + RELOC/tex/latex/schule/tikz/usym2729.tikz + RELOC/tex/latex/schule/tikz/usym272A.tikz + RELOC/tex/latex/schule/tikz/usym272B.tikz + RELOC/tex/latex/schule/tikz/usym272C.tikz + RELOC/tex/latex/schule/tikz/usym272D.tikz + RELOC/tex/latex/schule/tikz/usym272E.tikz + RELOC/tex/latex/schule/tikz/usym272F.tikz + RELOC/tex/latex/schule/tikz/usym2730.tikz + RELOC/tex/latex/schule/tikz/usym2731.tikz + RELOC/tex/latex/schule/tikz/usym2732.tikz + RELOC/tex/latex/schule/tikz/usym2733.tikz + RELOC/tex/latex/schule/tikz/usym2734.tikz + RELOC/tex/latex/schule/tikz/usym2735.tikz + RELOC/tex/latex/schule/tikz/usym2736.tikz + RELOC/tex/latex/schule/tikz/usym2737.tikz + RELOC/tex/latex/schule/tikz/usym2738.tikz + RELOC/tex/latex/schule/tikz/usym2739.tikz + RELOC/tex/latex/schule/tikz/usym273A.tikz + RELOC/tex/latex/schule/tikz/usym273B.tikz + RELOC/tex/latex/schule/tikz/usym273C.tikz + RELOC/tex/latex/schule/tikz/usym273D.tikz + RELOC/tex/latex/schule/tikz/usym273E.tikz + RELOC/tex/latex/schule/tikz/usym273F.tikz + RELOC/tex/latex/schule/tikz/usym2740.tikz + RELOC/tex/latex/schule/tikz/usym2741.tikz + RELOC/tex/latex/schule/tikz/usym2742.tikz + RELOC/tex/latex/schule/tikz/usym2743.tikz + RELOC/tex/latex/schule/tikz/usym2744.tikz + RELOC/tex/latex/schule/tikz/usym2745.tikz + RELOC/tex/latex/schule/tikz/usym2746.tikz + RELOC/tex/latex/schule/tikz/usym2747.tikz + RELOC/tex/latex/schule/tikz/usym2748.tikz + RELOC/tex/latex/schule/tikz/usym2749.tikz + RELOC/tex/latex/schule/tikz/usym274A.tikz + RELOC/tex/latex/schule/tikz/usym274B.tikz + RELOC/tex/latex/schule/tikz/usym274C.tikz + RELOC/tex/latex/schule/tikz/usym274D.tikz + RELOC/tex/latex/schule/tikz/usym274E.tikz + RELOC/tex/latex/schule/tikz/usym274F.tikz + RELOC/tex/latex/schule/tikz/usym2750.tikz + RELOC/tex/latex/schule/tikz/usym2751.tikz + RELOC/tex/latex/schule/tikz/usym2752.tikz + RELOC/tex/latex/schule/tikz/usym2753.tikz + RELOC/tex/latex/schule/tikz/usym2754.tikz + RELOC/tex/latex/schule/tikz/usym2755.tikz + RELOC/tex/latex/schule/tikz/usym2756.tikz + RELOC/tex/latex/schule/tikz/usym2757.tikz + RELOC/tex/latex/schule/tikz/usym2758.tikz + RELOC/tex/latex/schule/tikz/usym2759.tikz + RELOC/tex/latex/schule/tikz/usym275A.tikz + RELOC/tex/latex/schule/tikz/usym275B.tikz + RELOC/tex/latex/schule/tikz/usym275C.tikz + RELOC/tex/latex/schule/tikz/usym275D.tikz + RELOC/tex/latex/schule/tikz/usym275E.tikz + RELOC/tex/latex/schule/tikz/usym275F.tikz + RELOC/tex/latex/schule/tikz/usym2760.tikz + RELOC/tex/latex/schule/tikz/usym2761.tikz + RELOC/tex/latex/schule/tikz/usym2762.tikz + RELOC/tex/latex/schule/tikz/usym2763.tikz + RELOC/tex/latex/schule/tikz/usym2764.tikz + RELOC/tex/latex/schule/tikz/usym2765.tikz + RELOC/tex/latex/schule/tikz/usym2766.tikz + RELOC/tex/latex/schule/tikz/usym2767.tikz + RELOC/tex/latex/schule/tikz/usym2768.tikz + RELOC/tex/latex/schule/tikz/usym2769.tikz + RELOC/tex/latex/schule/tikz/usym276A.tikz + RELOC/tex/latex/schule/tikz/usym276B.tikz + RELOC/tex/latex/schule/tikz/usym276C.tikz + RELOC/tex/latex/schule/tikz/usym276D.tikz + RELOC/tex/latex/schule/tikz/usym276E.tikz + RELOC/tex/latex/schule/tikz/usym276F.tikz + RELOC/tex/latex/schule/tikz/usym2770.tikz + RELOC/tex/latex/schule/tikz/usym2771.tikz + RELOC/tex/latex/schule/tikz/usym2772.tikz + RELOC/tex/latex/schule/tikz/usym2773.tikz + RELOC/tex/latex/schule/tikz/usym2774.tikz + RELOC/tex/latex/schule/tikz/usym2775.tikz + RELOC/tex/latex/schule/tikz/usym2776.tikz + RELOC/tex/latex/schule/tikz/usym2777.tikz + RELOC/tex/latex/schule/tikz/usym2778.tikz + RELOC/tex/latex/schule/tikz/usym2779.tikz + RELOC/tex/latex/schule/tikz/usym277A.tikz + RELOC/tex/latex/schule/tikz/usym277B.tikz + RELOC/tex/latex/schule/tikz/usym277C.tikz + RELOC/tex/latex/schule/tikz/usym277D.tikz + RELOC/tex/latex/schule/tikz/usym277E.tikz + RELOC/tex/latex/schule/tikz/usym277F.tikz + RELOC/tex/latex/schule/tikz/usym2780.tikz + RELOC/tex/latex/schule/tikz/usym2781.tikz + RELOC/tex/latex/schule/tikz/usym2782.tikz + RELOC/tex/latex/schule/tikz/usym2783.tikz + RELOC/tex/latex/schule/tikz/usym2784.tikz + RELOC/tex/latex/schule/tikz/usym2785.tikz + RELOC/tex/latex/schule/tikz/usym2786.tikz + RELOC/tex/latex/schule/tikz/usym2787.tikz + RELOC/tex/latex/schule/tikz/usym2788.tikz + RELOC/tex/latex/schule/tikz/usym2789.tikz + RELOC/tex/latex/schule/tikz/usym278A.tikz + RELOC/tex/latex/schule/tikz/usym278B.tikz + RELOC/tex/latex/schule/tikz/usym278C.tikz + RELOC/tex/latex/schule/tikz/usym278D.tikz + RELOC/tex/latex/schule/tikz/usym278E.tikz + RELOC/tex/latex/schule/tikz/usym278F.tikz + RELOC/tex/latex/schule/tikz/usym2790.tikz + RELOC/tex/latex/schule/tikz/usym2791.tikz + RELOC/tex/latex/schule/tikz/usym2792.tikz + RELOC/tex/latex/schule/tikz/usym2793.tikz + RELOC/tex/latex/schule/tikz/usym2794.tikz + RELOC/tex/latex/schule/tikz/usym2795.tikz + RELOC/tex/latex/schule/tikz/usym2796.tikz + RELOC/tex/latex/schule/tikz/usym2797.tikz + RELOC/tex/latex/schule/tikz/usym2798.tikz + RELOC/tex/latex/schule/tikz/usym2799.tikz + RELOC/tex/latex/schule/tikz/usym279A.tikz + RELOC/tex/latex/schule/tikz/usym279B.tikz + RELOC/tex/latex/schule/tikz/usym279C.tikz + RELOC/tex/latex/schule/tikz/usym279D.tikz + RELOC/tex/latex/schule/tikz/usym279E.tikz + RELOC/tex/latex/schule/tikz/usym279F.tikz + RELOC/tex/latex/schule/tikz/usym27A0.tikz + RELOC/tex/latex/schule/tikz/usym27A1.tikz + RELOC/tex/latex/schule/tikz/usym27A2.tikz + RELOC/tex/latex/schule/tikz/usym27A3.tikz + RELOC/tex/latex/schule/tikz/usym27A4.tikz + RELOC/tex/latex/schule/tikz/usym27A5.tikz + RELOC/tex/latex/schule/tikz/usym27A6.tikz + RELOC/tex/latex/schule/tikz/usym27A7.tikz + RELOC/tex/latex/schule/tikz/usym27A8.tikz + RELOC/tex/latex/schule/tikz/usym27A9.tikz + RELOC/tex/latex/schule/tikz/usym27AA.tikz + RELOC/tex/latex/schule/tikz/usym27AB.tikz + RELOC/tex/latex/schule/tikz/usym27AC.tikz + RELOC/tex/latex/schule/tikz/usym27AD.tikz + RELOC/tex/latex/schule/tikz/usym27AE.tikz + RELOC/tex/latex/schule/tikz/usym27AF.tikz + RELOC/tex/latex/schule/tikz/usym27B0.tikz + RELOC/tex/latex/schule/tikz/usym27B1.tikz + RELOC/tex/latex/schule/tikz/usym27B2.tikz + RELOC/tex/latex/schule/tikz/usym27B3.tikz + RELOC/tex/latex/schule/tikz/usym27B4.tikz + RELOC/tex/latex/schule/tikz/usym27B5.tikz + RELOC/tex/latex/schule/tikz/usym27B6.tikz + RELOC/tex/latex/schule/tikz/usym27B7.tikz + RELOC/tex/latex/schule/tikz/usym27B8.tikz + RELOC/tex/latex/schule/tikz/usym27B9.tikz + RELOC/tex/latex/schule/tikz/usym27BA.tikz + RELOC/tex/latex/schule/tikz/usym27BB.tikz + RELOC/tex/latex/schule/tikz/usym27BC.tikz + RELOC/tex/latex/schule/tikz/usym27BD.tikz + RELOC/tex/latex/schule/tikz/usym27BE.tikz + RELOC/tex/latex/schule/tikz/usym27BF.tikz + RELOC/tex/latex/schule/utfsym.sty + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-binnen.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-default.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-keinenummer.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-keinepunkte.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-keintitel.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-randpunkte.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-tabelle-kurz.code.tex + RELOC/tex/latex/schule/xsim-style/xsim.style.schule-tcolorbox.code.tex catalogue-ctan /macros/latex/contrib/schule -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-23 04:21:50 +0200 catalogue-license lppl1.3 catalogue-topics teaching -catalogue-version 0.6 +catalogue-version 0.8.1 name schulschriften category Package @@ -224391,31 +226434,31 @@ name schwalbe-chess category Package -revision 39318 +revision 48356 shortdesc Typeset the German chess magazine "Die Schwalbe" relocated 1 longdesc The package is based on chess-problem-diagrams, which in its longdesc turn has a dependency on the bartel-chess-fonts. -containersize 6400 -containerchecksum 574cd03b0d11df852cc0944bec1ee1495dc2258e6c45d2bb2906ed5c07f028ff8f5617ccfd6a84a461fe19b02352f1244856d8febf38ae6cb3f8d224b0395ea9 -doccontainersize 169420 -doccontainerchecksum d394bee3fe2164e8885d7618121f37bea9705b7ff71b3b4b9236566adbe9349b5c76029b6d99fa56b4335c9a308b0eb6a3472a82687fb88680cad4528897ac9b -docfiles size=50 +containersize 6736 +containerchecksum 795d5317b5eccfdc46c0b6887e55453492b297483c55f3b58255b3039c78f9a4af0fc9aba0cd5f682e7577a7ccf3322b3ebfdec1a3b7a7b16d47cd723b6921ef +doccontainersize 179260 +doccontainerchecksum d8aaa1cd0733aa92fcc0f8f869f87073ffeb919c978c91319aca0c94567926b8838da3dfe89343682026e245fc532b9b5efbfeea60b9e30136fa57e138b0c057 +docfiles size=52 RELOC/doc/latex/schwalbe-chess/README details="Readme" RELOC/doc/latex/schwalbe-chess/schwalbe.pdf details="Package documentation (German)" language="de" -srccontainersize 12556 -srccontainerchecksum 17b699b14e4cee4cb760c19870a5284b37ad893c665d602240de74695c1aedbe82cd131f7e88312add8f7c8fe4adb7d72ce25e7f9e9e11a06be709cd58dca926 -srcfiles size=14 +srccontainersize 13692 +srccontainerchecksum 722d1bbd37e4ca93a4a090c0c235dbaef02b3659259f98a357f1da2de204819d70d1192eb60988044c3842d6def9aa391eed49eaa7a25defd3e990b0e53b6f84 +srcfiles size=16 RELOC/source/latex/schwalbe-chess/schwalbe.dtx RELOC/source/latex/schwalbe-chess/schwalbe.ins -runfiles size=9 +runfiles size=10 RELOC/tex/latex/schwalbe-chess/schwalbe.cls RELOC/tex/latex/schwalbe-chess/schwalbe.sty catalogue-ctan /macros/latex/contrib/schwalbe-chess -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-08-05 18:38:54 +0200 catalogue-license lppl1.2 catalogue-topics journalpub games class -catalogue-version 2.1 +catalogue-version 2.2 name scientific-thesis-cover category Package @@ -235154,22 +237197,22 @@ name subfiles category Package -revision 26645 +revision 48323 shortdesc Individual typesetting of subfiles of a "main" document relocated 1 longdesc Using subfiles the user can handle multi-file projects more longdesc comfortably making it possible to both process the subsidiary longdesc files by themselves and to process the main file that includes longdesc them, without making any changes to either. -containersize 1412 -containerchecksum a0955ba9e7cdb7353e96b374d6387ce80df2a76035644afa2a9222fa7e703571d9cb51931167bc79b326cc7f61cb1c857e9877365d4048cf43b8a4cac9561d55 -doccontainersize 53704 -doccontainerchecksum a281470324813a9daa776e837903f6a4be04c46d5a6c23b6b0d9a9f3f7545d1bdc7a99ecaf72bd76abe59b7811d98bfcef779ccabe32f21feda4986469f33976 -docfiles size=15 +containersize 1444 +containerchecksum bce3972400535736b306fe1d87e10b79dfe26675ad18ef272a91d1046e91302bebc1413bffe11785780eb7379a0daaf4d12cd64954d803a6c1c220a213a334cf +doccontainersize 231984 +doccontainerchecksum 73a923c6bdd7901b1d77b64c33905f78613cf9c32dd85b2639db6ae6d43d4918405ff27e02eb36ea26443055aa31beb3075f2ae27e891110229dce2f59baee9c +docfiles size=58 RELOC/doc/latex/subfiles/README RELOC/doc/latex/subfiles/subfiles.pdf details="Package documentation" -srccontainersize 4432 -srccontainerchecksum daa99fc363d11a236902e8a386666fb628a413354ad44da07d8a313a97b634c072929ef2cd9796a264b496d919e8d63b9a15b3821fb9a5a57ac1a4e4d86eeb68 +srccontainersize 4900 +srccontainerchecksum 5f01c63aa2112a2b94cbffe8452976126f0a44cec0523dca39ad022515f06a35e95b1e43bf61c30a974ac50d3252e46b2db1bdc4ab9cc1729c11375e95cb015f srcfiles size=4 RELOC/source/latex/subfiles/subfiles.dtx RELOC/source/latex/subfiles/subfiles.ins @@ -235178,10 +237221,10 @@ RELOC/tex/latex/subfiles/subfiles.sty catalogue-also combine standalone catalogue-ctan /macros/latex/contrib/subfiles -catalogue-date 2016-06-24 19:18:15 +0200 +catalogue-date 2018-07-31 17:12:00 +0200 catalogue-license lppl1.3 catalogue-topics subdocs -catalogue-version 1.1 +catalogue-version 1.2 name subfloat category Package @@ -237954,31 +239997,38 @@ name tagpdf category Package -revision 48178 -shortdesc Experiments with tagging using pdfLaTeX and LuaLaTeX +revision 48366 +shortdesc Tools for experimenting with tagging using pdfLaTeX and LuaLaTeX relocated 1 -longdesc he package offers tools to experiment with tagging and +longdesc The package offers tools to experiment with tagging and longdesc accessibility using pdfLaTeX and LuaTeX. It isn't meant for -longdesc production but allows to try out, how difficult it is to tag -longdesc some structures; to try out, how much tagging is really needed, -longdesc to test what else is needed so that a pdf works e.g. with a -longdesc screen reader. Its goal is to get a feeling what has to be -longdesc done, which kernel changes are needed, how packages should be -longdesc adapted. -containersize 17240 -containerchecksum 12d4ed19479a4925aa9af750ad528679d47d2f6e27f45f947eb3afcd33d2e63303051da27ddd6395c3f6297d01b2079b6fdda297cb1ad08b463739e6357b3a65 -doccontainersize 468160 -doccontainerchecksum 2485e783d894a4c1d220b6a23c54d2bea50b91808595b285e6728f067f886b2c574a17c0c16f9b5caf3e27630be72e62260acb18fd7c5083ff1fb346b88dcf02 -docfiles size=151 +longdesc production but allows the user to try out how difficult it is +longdesc to tag some structures; to try out how much tagging is really +longdesc needed; to test what else is needed so that a pdf works e.g. +longdesc with a screen reader. Its goal is to get a feeling for what has +longdesc to be done, which kernel changes are needed, how packages +longdesc should be adapted. +containersize 17864 +containerchecksum 5cd991f2ef8eb7ce9a84e11d0208cb3207294d8ec39028f447e852d891b535a4d8527559646772832d05d0188718e87edec7527a8e4ff9b10324022c3ec67dea +doccontainersize 490700 +doccontainerchecksum b7c189cfebfa9ccda9dee7dc4e79c0a1eb50f70dd04c251ec7b5a469de91c09dcc87b6a913a61e54aca9332280142725c7d8341ccac87edd518667d2c21c2ba7 +docfiles size=179 RELOC/doc/latex/tagpdf/README.md details="Readme" + RELOC/doc/latex/tagpdf/ex-alt-actualtext-luatex.pdf + RELOC/doc/latex/tagpdf/ex-alt-actualtext.pdf + RELOC/doc/latex/tagpdf/ex-alt-actualtext.tex + RELOC/doc/latex/tagpdf/ex-formula-problem-luatex.pdf + RELOC/doc/latex/tagpdf/ex-formula-problem.tex RELOC/doc/latex/tagpdf/ex-mc-manual-para-split.pdf RELOC/doc/latex/tagpdf/ex-mc-manual-para-split.tex RELOC/doc/latex/tagpdf/ex-patch-list-luatex.pdf RELOC/doc/latex/tagpdf/ex-patch-list.pdf RELOC/doc/latex/tagpdf/ex-patch-list.tex - RELOC/doc/latex/tagpdf/ex-patch-sectioning-koma-luamode.pdf + RELOC/doc/latex/tagpdf/ex-patch-sectioning-koma-luatex.pdf RELOC/doc/latex/tagpdf/ex-patch-sectioning-koma.pdf RELOC/doc/latex/tagpdf/ex-patch-sectioning-koma.tex + RELOC/doc/latex/tagpdf/ex-softhyphen.pdf + RELOC/doc/latex/tagpdf/ex-softhyphen.tex RELOC/doc/latex/tagpdf/ex-structure.pdf RELOC/doc/latex/tagpdf/ex-structure.tex RELOC/doc/latex/tagpdf/ex-tagpdf-template.pdf @@ -237986,7 +240036,7 @@ RELOC/doc/latex/tagpdf/tagpdf.bib RELOC/doc/latex/tagpdf/tagpdf.pdf details="Package documentation" RELOC/doc/latex/tagpdf/tagpdf.tex -runfiles size=23 +runfiles size=24 RELOC/tex/latex/tagpdf/tagpdf-checks-code.sty RELOC/tex/latex/tagpdf/tagpdf-luatex.def RELOC/tex/latex/tagpdf/tagpdf-mc-code-generic.sty @@ -238000,10 +240050,10 @@ RELOC/tex/latex/tagpdf/tagpdf.lua RELOC/tex/latex/tagpdf/tagpdf.sty catalogue-ctan /macros/latex/contrib/tagpdf -catalogue-date 2018-07-10 14:18:55 +0200 +catalogue-date 2018-08-07 09:14:17 +0200 catalogue-license lppl1.3c catalogue-topics tagged-pdf accessible -catalogue-version 0.2 +catalogue-version 0.3 name talk category Package @@ -238263,22 +240313,23 @@ name tcolorbox category Package -revision 47079 +revision 48282 shortdesc Coloured boxes, for LaTeX examples and theorems, etc relocated 1 -longdesc The package provides an environment for coloured and framed +longdesc This package provides an environment for coloured and framed longdesc text boxes with a heading line. Optionally, such a box may be longdesc split in an upper and a lower part; thus the package may be longdesc used for the setting of LaTeX examples where one part of the longdesc box displays the source code and the other part shows the longdesc output. Another common use case is the setting of theorems. The longdesc package supports saving and reuse of source code and text -longdesc parts. -containersize 228112 -containerchecksum 335bb03016629c14ade508a538a70d4e164459c949d6c5602a489b36883df161b0ae1963e9d303bd301325edc9a90525a0a9dc6bc6a7a26a0fbb4e4d01b3650d -doccontainersize 4493868 -doccontainerchecksum 5ee9a63715744a34cad78ac9e8a58c861900db654fd32302644f389a7a873aabe645fd51a61a6ffc807aa4cbb3c77c19aca4643facfc96ac604bdc3adfb468f9 -docfiles size=2156 +longdesc parts. The package depends on the pgf, verbatim, environ, and +longdesc etoolbox packages. +containersize 228252 +containerchecksum 17674128bd7097cd1d8ee26c59c1b287492da4897cc5eb4cb6afe9fb9257c15f38702e368300b81f0972bc6d91de3b714bc56f94da45fa53d0d7063b69affedf +doccontainersize 4501428 +doccontainerchecksum 81002f21baa3f58f892ac125c0f5868730e3073203179a2bb64844de56bfc6d7a49f322c93a6e28fd97cc1b2c98c8b0c950ceff71537e9d5355baa5413fa1b4f +docfiles size=2162 RELOC/doc/latex/tcolorbox/Basilica_5.png RELOC/doc/latex/tcolorbox/CHANGES RELOC/doc/latex/tcolorbox/README details="Readme" @@ -238347,10 +240398,10 @@ RELOC/tex/latex/tcolorbox/tcbxparse.code.tex RELOC/tex/latex/tcolorbox/tcolorbox.sty catalogue-ctan /macros/latex/contrib/tcolorbox -catalogue-date 2018-03-22 21:00:08 +0100 +catalogue-date 2018-07-26 17:55:35 +0200 catalogue-license lppl1.3 catalogue-topics boxing colour verbatim listing -catalogue-version 4.13 +catalogue-version 4.14 name tdclock category Package @@ -249280,16 +251331,16 @@ name texlive-docindex category TLCore -revision 48262 +revision 48462 shortdesc top-level TeX Live doc.html, etc. longdesc These files are regenerated as needed, which is often, so we longdesc make them a separate package. See the tl-update-auto script longdesc for the process. containersize 109804 -containerchecksum 002b426a67d3d084077c884b31221f6eb4b3df9e52919fed6a42458e96486cc361a937dc47b1753daf19681e2037c7b01ad92a14fc2867ee71fd7d57db5c687e -doccontainersize 132712 -doccontainerchecksum f52cb31726c126873c2ea535393f1b86bd610d936329d1700884bb40d289e8515989e773a3adb80fd486b27f9d9efe0be8dfe75918371fb3c6a506f7f86cd9e3 -docfiles size=241 +containerchecksum 9d7f189c18193e20bd689d04bd5927275a5f7e4474ba3a183e9e2a6f6067c2b7ed783c2c25c737b2ef303216b551c0ab1a8df7d67895a39e1e2680e7f983f712 +doccontainersize 133524 +doccontainerchecksum d537661c7bda6bcf9b18dfc757b5c3e1aeeff480b3e2f3053eff447c7b4ba535a9d3053dbc9776e2be16e0ea0dfdc7ba3b2c3598d619fc611eaea3362871d83d +docfiles size=243 doc.html runfiles size=270 texmf-dist/scripts/texlive/var/texcatalogue.keywords @@ -249413,14 +251464,14 @@ name texlive-msg-translations category TLCore -revision 48106 +revision 48373 shortdesc translations of the TeX Live installer and TeX Live Manager longdesc This package contains the translated messages of the TeX Live longdesc installer and TeX Live Manager. For information on creating or longdesc updating translations, see longdesc http://tug.org/texlive/doc.html#install-tl-xlate. -containersize 111656 -containerchecksum 17e6f7fdfd4d66f1e45e3044bb926cb23b8a67a6e011c841adf629e60573e176a58908091e7204b41e2f5b5f352e3faf625cf45445ba18aacfa8c8ecd606983f +containersize 111624 +containerchecksum bda93a4bbf5a20c9814dd1c42040ee1587cb7391026d2838959d6079fc8e11aa03b5073c6f59c3f69595972aba662b235c303605c0e7430d1c867b2fa46600fb runfiles size=287 tlpkg/translations/README tlpkg/translations/cs.po @@ -249481,17 +251532,17 @@ name texlive-scripts category TLCore -revision 48248 +revision 48435 shortdesc TeX Live infrastructure programs longdesc Includes install-tl, tl-portable, rungs, etc.; not needed for longdesc tlmgr to run but still ours. Not included in tlcritical. depend texlive.infra depend texlive-scripts.ARCH postaction shortcut type=menu name="TeX Live command-line" cmd=TEXDIR/tlpkg/installer/tl-cmd.bat -containersize 68392 -containerchecksum 538447125a580a21e91bfb5119d3c8e98fcae43c6badfe9addff64fcb8a87122219a18c8f0544968a5fe78e5c003232f3d64d45d064fced266d4294b8219ee82 -doccontainersize 51588 -doccontainerchecksum 5ac0154acfefd41bc89a8ab59a4a0c9185c712820eb2ab0e4c3e5f9272b0031f2034b457f013b95eb65090fbe81b1e2300f6e0cbb8e674fa70cd3e310ad1ddb7 +containersize 68836 +containerchecksum f8c28d12fa29d2b334f71a2cdb6fcac415605b290bc47e51e5a90b5a69b60bf5f93652f5468c06cc46b3082393862678084603cc607c20bf06972e6b0c13b09e +doccontainersize 51604 +doccontainerchecksum 716987862bf0cfd9037ed98ac98c68c95263de8ff5078d8af6fc73a810d9d6616ab6f863adf05e6e2e94f7301cdd8fa366496e0c911913a5a9ac9139f7b84298 docfiles size=19 texmf-dist/doc/man/man1/install-tl.1 texmf-dist/doc/man/man1/install-tl.man1.pdf @@ -249612,10 +251663,10 @@ name texlive-scripts.win32 category TLCore -revision 46932 +revision 48351 shortdesc win32 files of texlive-scripts containersize 7944 -containerchecksum 0326864f83005a89f434d378c1a7dcd498e59843b0d4a60511a6cdae0daf533a16c14011b403f709e947bc5dd828435d4d5d245eb5eaaab5725304919a9d29b0 +containerchecksum c5ee904e355655e9a4279f41af98f3fa34fb9b9e8461073461055bb07b9f352a23c87e9a73315ab1e116fb6a259ee3852b41646066db3fd58eabe515e840f7ca binfiles arch=win32 size=9 bin/win32/rungs.exe install-tl-advanced.bat @@ -249727,7 +251778,7 @@ name texlive.infra category TLCore -revision 47951 +revision 48275 shortdesc basic TeX Live infrastructure longdesc This package contains the files needed to get the TeX Live longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus @@ -249736,10 +251787,10 @@ longdesc close, but not the same; it's defined in 00texlive.installer. depend texlive.infra.ARCH postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr-gui.exe -containersize 211240 -containerchecksum 648b993fc6b69d2a6392b16f6042d07198bd6e19cdb9b558cbed0835e186f54a5315e387f654a3ad4d9f77d020e9e03e1518bd6948f1e0f88cbe23e9ecc15e06 -doccontainersize 188144 -doccontainerchecksum 1a80fb6375b11385827cd7dc1103e2f04feb51bdecf05f8b9793ab731e6387888464cbfa6d2d640e98baaa989ed8fe54e9a72f6739e9a01449277fced52779a0 +containersize 211988 +containerchecksum ea2ee8946960d5e068f98e5629aca8d9b8322c942403f15587f479999b7e74190c532b792d989efe8a07e2339d77f125ed85c5bd71f45b3eb3140ca11c558ff9 +doccontainersize 188436 +doccontainerchecksum 9f0aebc92b0c1dc0f5795119b53e0a439ab2c235761052226d38c03fc0c04107c065f13e9c7aae59a57db33f2c12b5a74929284f9b4f8ee3f247fab490014815 docfiles size=126 README README.usergroups @@ -249778,7 +251829,7 @@ texmf-dist/scripts/texlive/NEWS tlpkg/README tlpkg/installer/COPYING.MinGW-runtime.txt -runfiles size=243 +runfiles size=244 LICENSE.CTAN LICENSE.TL release-texlive.txt @@ -249917,10 +251968,10 @@ name texlive.infra.win32 category TLCore -revision 47820 +revision 48059 shortdesc win32 files of texlive.infra -containersize 1474592 -containerchecksum baa9dee03e755b265f2a6089bbc325f933a358e330e4382df18b5cf507c239aca038e21aa8374fca0e1ba19d2dade4edaf07cbef944d174f54476913b7d7c092 +containersize 1472592 +containerchecksum 9c65d26cfa18285346d9c36370678bfbbcfcd52d67aa9940242b860f9cb933669a01a0d072f02cc2d1897838ef3c63e55a25effd2e4f33ea9be9fe9b94b94f50 binfiles arch=win32 size=887 bin/win32/runscript.dll bin/win32/runscript.exe @@ -252393,7 +254444,7 @@ name thesis-gwu category Package -revision 48180 +revision 48324 shortdesc Thesis class for George Washington University School of Engineering and Applied Science relocated 1 longdesc This class is an attempt to create a standard format for GWU @@ -252401,10 +254452,10 @@ longdesc complicated formatting requirements and includes many useful longdesc packages. An example thesis is provided serving as a user guide longdesc and a demonstration of the thesis. -containersize 10328 -containerchecksum 050e0e2bece0e9eaa0371a0fc1f7087bf7e595d330d36661d55414c886cbcbe291129881123fe453be4ccb77ad15f64618384fa260a73d547f2d2c805a590e60 -doccontainersize 512892 -doccontainerchecksum 0c76b3290d0ffe61752a2b0fc5e314c56c910cae335894954225a2a072189f7aebcaa54548a34c4d10806312f9b28909e4b5faf06271f3705622520c6aec1484 +containersize 10364 +containerchecksum be317f5e9582cacad9bee92ce4cb3ea20c2310f7097dcb0d014d639e7ae578236d9fa8d9b3b60e14766e92a6f48782eed96605186c3fa02413273401795f8911 +doccontainersize 512884 +doccontainerchecksum c7dc040fc9eea4a7883fd2b71f69bd10d5fbda21059c3a1bc0c42d6bea0b4482905470b9c02798425eaed2f35e040b7e38a718284322be30a9d8b531828b8fbd docfiles size=167 RELOC/doc/latex/thesis-gwu/LICENSE.md RELOC/doc/latex/thesis-gwu/README.md details="Readme" @@ -252424,10 +254475,10 @@ runfiles size=13 RELOC/tex/latex/thesis-gwu/thesis-gwu.cls catalogue-ctan /macros/latex/contrib/thesis-gwu -catalogue-date 2018-07-10 05:58:03 +0200 +catalogue-date 2018-07-31 17:37:07 +0200 catalogue-license gpl3 catalogue-topics dissertation class -catalogue-version 1.5.1 +catalogue-version 1.6.0 name thesis-titlepage-fhac category Package @@ -253735,6 +255786,38 @@ catalogue-topics pgf-tikz diagram catalogue-version 0.1 +name tikz-network +category Package +revision 48314 +shortdesc Draw networks with TikZ +relocated 1 +longdesc This package allows the creation of images of complex networks +longdesc that are seamlessly integrated into the underlying LaTeX files. +containersize 8120 +containerchecksum bf8dc0cf66e2a3a0317265d7ae5b79bcc417aac278753b6c935831904bab9cd5ae1c65b3fa1a776caa5a798b1e038d21c6c4e00ca78a26e591047290f3f4717c +doccontainersize 790024 +doccontainerchecksum 79031df0589f4d900a044b617a6aa251fb0e137cf379a6530c0061955ecddc081a1fda8997359d36f0036395db070d34909d6b728eb216057bfe81e236ed5083 +docfiles size=278 + RELOC/doc/latex/tikz-network/README.md details="Readme" + RELOC/doc/latex/tikz-network/data/edges.csv + RELOC/doc/latex/tikz-network/data/front.pdf + RELOC/doc/latex/tikz-network/data/ml_edges.csv + RELOC/doc/latex/tikz-network/data/ml_edges_simple.csv + RELOC/doc/latex/tikz-network/data/ml_vertices.csv + RELOC/doc/latex/tikz-network/data/ml_vertices_simple.csv + RELOC/doc/latex/tikz-network/data/plane.png + RELOC/doc/latex/tikz-network/data/vertices.csv + RELOC/doc/latex/tikz-network/data/vertices_RGB.csv + RELOC/doc/latex/tikz-network/tikz-network.pdf details="Package documentation" + RELOC/doc/latex/tikz-network/tikz-network.tex +runfiles size=13 + RELOC/tex/latex/tikz-network/tikz-network.sty +catalogue-ctan /graphics/pgf/contrib/tikz-network +catalogue-date 2018-07-30 12:45:41 +0200 +catalogue-license gpl3+ +catalogue-topics pgf-tikz diagram +catalogue-version 1.0 + name tikz-opm category Package revision 32769 @@ -262298,18 +264381,18 @@ name turabian-formatting category Package -revision 47796 +revision 48330 shortdesc Formatting based on Turabian's Manual relocated 1 longdesc The turabian-formatting package provides Chicago-style longdesc formatting based on Kate L. Turabian's "A Manual for Writers of longdesc Research Papers, Theses, and Dissertations: Chicago Style for longdesc Students and Researchers" (9th edition). -containersize 8276 -containerchecksum 56ce5e50ca47ab956dcb515c44d9d64867a01858bf6a222d61daeea411c88411d7066401713f1ac9773af03b87b307b8e406d3678774f87cf9253c490ed03271 -doccontainersize 118492 -doccontainerchecksum c4c543e53601f374d2c8689a55767f6bc7080ef5417704c2729376658b9c320a18989faa4ba64976b66f5e52eb2cf836ffaf5f650cd11ac121ffc55665387ace -docfiles size=37 +containersize 8268 +containerchecksum 8fafd77c2572a787542f37f59a87c958031b95f7bcf6e48630465b97e6d92b82d16524633295561422d99c52f3ec3c42b46ccc1155f00a2a5d54c3b908d5d229 +doccontainersize 119024 +doccontainerchecksum abf60bc3ccb3a2855aebc8ed03ac3b7177e31f271206a9775b4d353484bf36696a78aade3b3230d8999627f1126a14b544a38d16a8b7651f6ef0669b912c632a +docfiles size=38 RELOC/doc/latex/turabian-formatting/README details="Readme" RELOC/doc/latex/turabian-formatting/turabian-formatting-doc.pdf details="Package documentation" RELOC/doc/latex/turabian-formatting/turabian-formatting-doc.tex @@ -262319,7 +264402,7 @@ RELOC/tex/latex/turabian-formatting/turabian-thesis.cls catalogue-also turabian biblatex-chicago catalogue-ctan /macros/latex/contrib/turabian-formatting -catalogue-date 2018-05-22 05:29:45 +0200 +catalogue-date 2018-08-01 18:15:02 +0200 catalogue-license lppl1.3 catalogue-topics dissertation class @@ -264000,6 +266083,36 @@ catalogue-topics inputenc unicode catalogue-version 2.2 +name ucsmonograph +category Package +revision 48438 +shortdesc Typesetting academic documents from the University of Caxias do Sul +relocated 1 +longdesc This is a LaTeX class for typesetting academic documents +longdesc according to the ABNT (Brazilian Technical Standards +longdesc Association) standards and the UCS (University of Caxias do +longdesc Sul) specifications. +containersize 3672 +containerchecksum 1c85c117e9a303c0f4e2f1fbadff2abc18d305caa1e71696882a17fd4bdd2b7bf65e715827781bc9537507f10fa75e5f79dbeef09241da4eea307fa3135c8700 +doccontainersize 399716 +doccontainerchecksum 4890b4c353829c6237815b32b3ae218c366cecea4672180a423b685ed79260727be69f676e64c5cb1c4f1085faae27407030cf87e64e5b03d600d263baea0ed1 +docfiles size=106 + RELOC/doc/latex/ucsmonograph/README.md details="Readme" + RELOC/doc/latex/ucsmonograph/ucsmonograph.pdf details="Package documentation" language="pt-br" +srccontainersize 10848 +srccontainerchecksum ffd9a267b08c5d21b41a40cd4805a7999f3e73afc2984eea5286c1674bf60c8ec90d3e1d891cc4feb60d73fae7b993d96d792a94c5ce7ea77c13342a4ecaa0d9 +srcfiles size=10 + RELOC/source/latex/ucsmonograph/ucsmonograph.dtx + RELOC/source/latex/ucsmonograph/ucsmonograph.ins +runfiles size=3 + RELOC/tex/latex/ucsmonograph/ucsmonograph.cls +catalogue-also abntex2 +catalogue-ctan /macros/latex/contrib/ucsmonograph +catalogue-date 2018-08-19 06:22:02 +0200 +catalogue-license lppl1.3c +catalogue-topics class dissertation portuguese-br +catalogue-version 1.1.0 + name ucthesis category Package revision 15878 @@ -268434,7 +270547,7 @@ name unicode-math category Package -revision 46515 +revision 48309 shortdesc Unicode mathematics support for XeTeX and LuaTeX relocated 1 longdesc This package will provide a complete implementation of unicode @@ -268449,11 +270562,11 @@ longdesc expl3, xpackages, filehook, ucharcat and lualatex-math longdesc packages. depend fontspec -containersize 42536 -containerchecksum 9df99551927f48b6b50281581292d055b7ff25c8296ab2001fa31527093153743e8dd3e17891a1f68f204b00314752c18287c1fd19540dc78379c919dcefc0e5 -doccontainersize 2145436 -doccontainerchecksum 2727ea73b01dc728ea848128ae28497434441910346fa1daf7a3968d202ff4d2ac27079b5e504b589ba2627030d9cf2b50d2a9d98c074a3fe75bef5043b2028b -docfiles size=564 +containersize 42836 +containerchecksum f00b3cd2569a15232d7ce01bc77a4ea02a3ebcb1fd8f6cef5c901a68a68757bc9e49ea84897ccdb05a902c3afd0a72603ab4b991b6a56338abf9bf1a6e5911f7 +doccontainersize 2142104 +doccontainerchecksum d79a62dfc064d17feac121bdca1a828e2b8e2edc98fe551d5a6a3582b021e9f76a53332ce08a965b72255c08707abd672fddafbe5b357ddde113bd45125bac1c +docfiles size=563 RELOC/doc/latex/unicode-math/CHANGES.md RELOC/doc/latex/unicode-math/LICENSE RELOC/doc/latex/unicode-math/MANIFEST.md @@ -268473,9 +270586,9 @@ RELOC/doc/latex/unicode-math/unimath-example.pdf details="Example of use" RELOC/doc/latex/unicode-math/unimath-symbols.ltx RELOC/doc/latex/unicode-math/unimath-symbols.pdf details="List of symbols defined by the package" -srccontainersize 37708 -srccontainerchecksum 2f10af79768bcc9dcf1b30d51d2aa66333c7a5d49cf34f9ad3872e5cea938a9cc8e264f873dbffee80809f1ccb6c3f87194079fec373f5f8206a318931ba3b2d -srcfiles size=67 +srccontainersize 38264 +srccontainerchecksum 77c6c0992fa3f8f1bd26bed872153013abd556b34f8ccbf0a4eea50dae25ea5d3c5bd04f2b01456aea75e9d071ac9063677ec6aa84dfb7f913532a02c7a2a792 +srcfiles size=68 RELOC/source/latex/unicode-math/um-code-alphabets.dtx RELOC/source/latex/unicode-math/um-code-amsmath.dtx RELOC/source/latex/unicode-math/um-code-api.dtx @@ -268498,16 +270611,16 @@ RELOC/source/latex/unicode-math/um-code-variables.dtx RELOC/source/latex/unicode-math/unicode-math.dtx RELOC/source/latex/unicode-math/unicode-math.ins -runfiles size=125 +runfiles size=127 RELOC/tex/latex/unicode-math/unicode-math-luatex.sty RELOC/tex/latex/unicode-math/unicode-math-table.tex RELOC/tex/latex/unicode-math/unicode-math-xetex.sty RELOC/tex/latex/unicode-math/unicode-math.sty catalogue-ctan /macros/latex/contrib/unicode-math -catalogue-date 2018-02-01 15:23:29 +0100 +catalogue-date 2018-07-29 10:57:53 +0200 catalogue-license lppl1.3c catalogue-topics maths font-use luatex xetex unicode -catalogue-version 0.8l +catalogue-version 0.8m name unisugar category Package @@ -269211,7 +271324,7 @@ name uplatex category Package -revision 47536 +revision 48294 shortdesc pLaTeX2e and miscellaneous macros for upTeX longdesc The bundle provides pLaTeX2e macros for upTeX by Takuji Tanaka. longdesc This is a community edition syncing with platex. The bundle @@ -269227,10 +271340,10 @@ depend uplatex.ARCH execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,hyphen-base,latex,latex-fonts,uptex-fonts,platex containersize 14448 -containerchecksum be245f911b12051e499b142716210f24eff40ef631a54d5819da10f1f72ecf5eee2c66459dcd71e6cb60a17bc61b8439c6516dc954718f6c342d9904500bafb3 -doccontainersize 850780 -doccontainerchecksum cfe22a24cdebdffd78a07144cb35d4c0481f52d7f003f19ba6d276d619d8fb449fc6d4fa80661618348d930ec0d40719c73742183ab537c9f59ea066aa9db5b5 -docfiles size=219 +containerchecksum 17c2a14fa7842d267b965e9eafa58e9e431c2528bbfe50aed58c1eed48a0724fac5973cd23ae92019c5faaf7f9e8c85fdf9a8b15370f3ace95b7e2125281547d +doccontainersize 858212 +doccontainerchecksum e613a2c041f211153733fe0f4289b25e2ed0e9874452e9de67d041e371868c5706b1efda627c5b2957013e3dcf89ffb0053482df4de634a781198cf877108d38 +docfiles size=220 texmf-dist/doc/man/man1/uplatex.1 texmf-dist/doc/man/man1/uplatex.man1.pdf texmf-dist/doc/uplatex/base/LICENSE @@ -269239,8 +271352,8 @@ texmf-dist/doc/uplatex/base/uplatex-en.pdf details="Package documentation" texmf-dist/doc/uplatex/base/uplatex.pdf details="Package documentation" language="ja" texmf-dist/doc/uplatex/base/upldoc.pdf -srccontainersize 49148 -srccontainerchecksum 7b88d42c7c89d01b6e9025728d369edda61d5cab16b2a6844ddf5ad33f9c7ecb4c6336a3045fe01e9e9fa8e5edc5b35feba97365fca07d6a049d21ce6109d7c2 +srccontainersize 49320 +srccontainerchecksum 77f975350f829290455d8be919aa652863af076666364e402f363043d942766b5933a93a2b834e8d1f48e0de0570037e21a621db5955a9781d75c8103b924158 srcfiles size=68 texmf-dist/source/uplatex/base/Makefile texmf-dist/source/uplatex/base/ujclasses.dtx @@ -269281,7 +271394,7 @@ texmf-dist/tex/uplatex/base/utsize12.clo texmf-dist/tex/uplatex/config/uplatex.ini catalogue-ctan /language/japanese/uplatex -catalogue-date 2018-04-08 16:07:02 +0200 +catalogue-date 2018-07-28 12:31:36 +0200 catalogue-license bsd3 catalogue-topics format class japanese @@ -276318,7 +278431,7 @@ name witharrows category Package -revision 48221 +revision 48422 shortdesc "Aligned" math environments with arrows for comments relocated 1 longdesc This package provides an environment WithArrows which is @@ -276328,25 +278441,25 @@ longdesc explanations concerning the mathematical calculus presented. longdesc The package requires the following other LaTeX packages: expl3, longdesc footnote, l3keys2e, tikz, and xparse. -containersize 7700 -containerchecksum 179b7702496448dabbdfd8f0fbacfcd01ba30dae4ec09766c528081e7658e099f9adde9e51f3992db05cf929b197c0fdc02559ec2c2a6b3218fd7caeb21a6b0b -doccontainersize 287692 -doccontainerchecksum a54fa7479a3c56e79c5e0dc742715603c678365fe0ef28d3cc77d3e69c81f4a4c4d1b0378e57931a6e7cd819ce437dbb450b6cc74a86c002ee4db1876618bd19 -docfiles size=74 +containersize 9156 +containerchecksum 822f85b81e81e0bf85ab65d7360c758763eaf2cd15e4c763783b5efd35714592388030d59b0ef9d721da9c1a7beb693ad68bd0ee318d1129e6992c5882ff4ce9 +doccontainersize 307404 +doccontainerchecksum 19054bf29ffdb75dd947cba9d4ab69715fcefa249aab29a3c544be9540fa978cda1ca1a606f75d03e045cfbbfbe73139bc9e0eaee27ec045dda969ed7a7e97b7 +docfiles size=78 RELOC/doc/latex/witharrows/README.md details="Readme" RELOC/doc/latex/witharrows/witharrows.pdf details="Package documentation" -srccontainersize 29416 -srccontainerchecksum fca4921f84ae131ef36fc8c187a1d251aa6d7d3b66701be644bb669d62f08835b1bba8b30033db990d8114f0252a99843c4391b04755bd16754964e1cb78166d -srcfiles size=38 +srccontainersize 32216 +srccontainerchecksum 2c76575df6246d3046ae03369a0f02ca9bcd33c0d7d7b4dc94098e65f1df5f93dae71ec63fc8776e4719fe66f02735c771fa217751b777e30434afac068dd423 +srcfiles size=43 RELOC/source/latex/witharrows/witharrows.dtx RELOC/source/latex/witharrows/witharrows.ins -runfiles size=11 +runfiles size=14 RELOC/tex/latex/witharrows/witharrows.sty catalogue-ctan /macros/latex/contrib/witharrows -catalogue-date 2018-07-18 20:03:32 +0200 +catalogue-date 2018-08-17 18:54:42 +0200 catalogue-license lppl1.3 -catalogue-topics maths maths-syseqn pgf-tikz -catalogue-version 1.7 +catalogue-topics maths maths-syseqn pgf-tikz expl3 +catalogue-version 1.9 name wnri category Package @@ -276687,6 +278800,35 @@ catalogue-topics layout catalogue-version 1.2b +name worksheet +category Package +revision 48423 +shortdesc Easy creation of worksheets +relocated 1 +longdesc This package provides macros and an environment for easy +longdesc worksheet creation: Use the exercise environment for formating +longdesc exercises in a simple, efficient design; typeset customized and +longdesc automatically numbered worksheet titles in the same way as +longdesc standard LaTeX titles (using \maketitle); provide course and +longdesc author information with a scrlayer-scrpage based automated +longdesc header; conforming to different babel languages. (Currently +longdesc English, French, and German are supported.) +containersize 3808 +containerchecksum e5a663f5469a03a528077df7cc02887c1411dce9ae6c3f8373f0e7e2627857d59bd79216d77d0e258d04a0fcfa158bb5ce9ee41786a4a3a0d1cfb9c61f57013c +doccontainersize 96080 +doccontainerchecksum 1225a2331432b64b9d25c265ce06ea8b2e7ccf8dc70e2f9880dd3d9eb0bdcffa77888deeaf6d807ddbbed71cff366a26da7f5e5b017f22c900d937f53602333f +docfiles size=30 + RELOC/doc/latex/worksheet/README.md details="Readme" + RELOC/doc/latex/worksheet/worksheet.pdf details="Package documentation" + RELOC/doc/latex/worksheet/worksheet.tex +runfiles size=4 + RELOC/tex/latex/worksheet/worksheet.sty +catalogue-ctan /macros/latex/contrib/worksheet +catalogue-date 2018-08-17 15:41:21 +0200 +catalogue-license lppl1.3c +catalogue-topics exercise exam +catalogue-version 1.1 + name wrapfig category Package revision 22048 @@ -279135,16 +281277,16 @@ name xepersian category Package -revision 48020 +revision 48396 shortdesc Persian for LaTeX, using XeTeX relocated 1 longdesc The xepersian package provides a convenient interface for longdesc typesetting Persian and English texts in LaTeX, using XeTeX longdesc engine. -containersize 57368 -containerchecksum fc07a300205e03cd5ab71675d4aafdc2eb53743a81c57e76bd59ddd7df463c33dcac26dcf92449438b061a4a1069ef69cd3bed27304ac343714c822f3e96c3d1 -doccontainersize 968872 -doccontainerchecksum 76990ecb2a85d641f85c91d1ef618cdc0190b427a579f5cd00ca633b5733027a05b3b4e33788bbb1ca8c2411edac669680739d6e5e08ec15bb41b483dbeace9e +containersize 57468 +containerchecksum 68c0654ad919a818f983509ca46b7ce3a63e7d590b67edc521116dbc8b1f54c659af7c6a225cf982019ca59440dda55b3cf99708995d711e481f7ad41f2a73a3 +doccontainersize 969372 +doccontainerchecksum 4637d7cddbc9c52bc8fa1da07b48cdd24e74d85395899213b025c4947e83dd7506d6905c068ae96370fa7abc52d1833f84de70ed8b9aa4fda4befc757d97c3c3 docfiles size=309 RELOC/doc/xelatex/xepersian/README details="Readme" RELOC/doc/xelatex/xepersian/dkun-0.3.py @@ -279164,8 +281306,8 @@ RELOC/doc/xelatex/xepersian/xepersian-doc.pdf details="Package user documentation" RELOC/doc/xelatex/xepersian/xepersian-logo.tex RELOC/doc/xelatex/xepersian/xepersian.pdf details="Package source documentation" -srccontainersize 73096 -srccontainerchecksum 9a3404af1c99a3731316fb07dbb4a8a37516b43f99451c1fd9a2468f8fbfaf71375207622dd31fb5fbd19f12b835d749af124bbe02f32695579e67a619316168 +srccontainersize 73012 +srccontainerchecksum b86e4f0d948b34e2606d9c7920e7dbf961a8b983a80fb36e0fd274843c9bd861c0261a93c9d29c6ae2261087dda9c90032ea4d5b31814d149f0b207f6d6f3755 srcfiles size=116 RELOC/source/xelatex/xepersian/xepersian-doc-basics.ltx RELOC/source/xelatex/xepersian/xepersian-doc-boolean.ltx @@ -279242,10 +281384,10 @@ RELOC/tex/xelatex/xepersian/xepersian-persiancal.sty RELOC/tex/xelatex/xepersian/xepersian.sty catalogue-ctan /macros/xetex/latex/xepersian -catalogue-date 2018-06-15 11:02:29 +0200 +catalogue-date 2018-08-12 09:38:03 +0200 catalogue-license lppl1.3c catalogue-topics persian xetex class -catalogue-version 21.2 +catalogue-version 21.3 name xesearch category Package @@ -279738,7 +281880,7 @@ name xetexko category Package -revision 47513 +revision 48378 shortdesc Typeset Korean with Xe(La)TeX relocated 1 longdesc The package supports typesetting Korean documents (including @@ -279746,16 +281888,16 @@ longdesc support, in XeTeX, providing features that provide quality longdesc typesetting. This package requires cjk-ko package for its full longdesc functionality. -containersize 57416 -containerchecksum 9e60245a3ee58841d62abaff373e5174de7f26fe94eb50ba454be174622c99ed391d7e426dd1540c3ff87830cf7a0abfb55ebd6c239ce78425796b7802733a2f -doccontainersize 231200 -doccontainerchecksum 9b657cb131e4b8e566f22fa3d5724e852a899de735048e71488d2bfc89947e31ea0b9aa972c0238d8be2da863573e766974650ec5454105d206ca7a3d669c71e +containersize 57316 +containerchecksum 1455e0374a3fef0b226b4a3bc78a9d5d6ffad5e2894a6e0666a2f7727b59484d622cbd32731447975d18927b136accb6ef701080ee89473bb9c31834ae99c2a8 +doccontainersize 231052 +doccontainerchecksum a6022a7b410c99c8077118e8725295403e52a85ce73a7aa11d85b100605dc234dfc864c3f0330b3f65688229e8c99b7f85c09946bb15f6604c0776f12dd4f692 docfiles size=65 RELOC/doc/xetex/xetexko/ChangeLog RELOC/doc/xetex/xetexko/README details="Readme" RELOC/doc/xetex/xetexko/xetexko-doc.pdf details="Package documentation" RELOC/doc/xetex/xetexko/xetexko-doc.tex -runfiles size=79 +runfiles size=78 RELOC/tex/xetex/xetexko/hanja_hangul.tab RELOC/tex/xetex/xetexko/hanjacom_hangul.tab RELOC/tex/xetex/xetexko/hanjaexa_hangul.tab @@ -279766,10 +281908,10 @@ RELOC/tex/xetex/xetexko/xetexko-vertical.sty RELOC/tex/xetex/xetexko/xetexko.sty catalogue-ctan /macros/xetex/generic/xetexko -catalogue-date 2018-04-21 06:05:21 +0200 +catalogue-date 2018-08-08 09:37:17 +0200 catalogue-license lppl1.3 catalogue-topics korean xetex -catalogue-version 2.19 +catalogue-version 2.21 name xetexref category Package @@ -279825,19 +281967,20 @@ name xfakebold category Package -revision 48268 +revision 48460 shortdesc Fake a regular font for bold characters relocated 1 -longdesc Package xfakebold uses the the text render from PDF to modify -longdesc the linewidth of an outline font to get bold characters. It -longdesc works only for vectorfonts where the glyphs are defined by its -longdesc outline. The package works in text and math mode and for -longdesc pdfLaTeX and LuaLaTeX. -containersize 1240 -containerchecksum fea6df9cb42d27c7425504ba01c129c77a696751f7f00c213df35bff6b418de6253c7b96dcb0eb9ccbc529a877946f4360fefdc4697a5945b40131231a77f7c0 -doccontainersize 65552 -doccontainerchecksum e81ad61f12ec6f5fc3aaad5b898bfbc95319c0e50bb4c72ffbb74a53049b43a7c10f914a3447c5770b56be9d89aef1e0c50105b139a795052d77affac266f1a2 -docfiles size=19 +longdesc This package uses PDF's text rendering to modify the linewidth +longdesc of an outline font to get bold characters. It works only for +longdesc vectorfonts where the glyphs are defined by their outline. The +longdesc package works both in text and in math mode, for pdfLaTeX as +longdesc well as for LuaLaTeX. The package depends on ifluatex, ifxetex, +longdesc and xkeyval. +containersize 1276 +containerchecksum 5280f916a16e48fb85751eb3b074a2890790d23d775dc0c3276107bab9e2015027c2b9fb8d63e7f6570029ac3f7fc1c2f7da05bb0b32b9891ad68cb04e123ef3 +doccontainersize 79456 +doccontainerchecksum 8eaac6452c8210076e9c4c5957b6d3f9ccea469d5e08f616c7bc9547d0ffb98fa9e724a1a99e15e78b230683b89b5132959156c80202d8adc43741179e632ab1 +docfiles size=24 RELOC/doc/latex/xfakebold/Changes RELOC/doc/latex/xfakebold/README details="Readme" RELOC/doc/latex/xfakebold/xfakebold-doc.pdf details="Package documentation" @@ -279845,10 +281988,10 @@ runfiles size=1 RELOC/tex/latex/xfakebold/xfakebold.sty catalogue-ctan /macros/latex/contrib/xfakebold -catalogue-date 2018-07-23 22:28:17 +0200 +catalogue-date 2018-08-22 15:59:18 +0200 catalogue-license lppl1.3c -catalogue-topics font-specialist font-supp-misc font-util pdf-feat -catalogue-version 0.01 +catalogue-topics font-supp-misc font-util pdf-feat +catalogue-version 0.04 name xfor category Package diff -Nru texlive-lang-2018.20180725/tlpkg/tlpobj/texlive.infra.doc.tlpobj texlive-lang-2018.20180824/tlpkg/tlpobj/texlive.infra.doc.tlpobj --- texlive-lang-2018.20180725/tlpkg/tlpobj/texlive.infra.doc.tlpobj 2018-06-08 00:25:04.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/tlpobj/texlive.infra.doc.tlpobj 2018-07-30 00:25:05.000000000 +0000 @@ -1,6 +1,6 @@ name texlive.infra.doc category TLCore -revision 47951 +revision 48275 shortdesc doc files of texlive.infra docfiles size=126 README diff -Nru texlive-lang-2018.20180725/tlpkg/tlpobj/texlive.infra.tlpobj texlive-lang-2018.20180824/tlpkg/tlpobj/texlive.infra.tlpobj --- texlive-lang-2018.20180725/tlpkg/tlpobj/texlive.infra.tlpobj 2018-06-08 00:25:04.000000000 +0000 +++ texlive-lang-2018.20180824/tlpkg/tlpobj/texlive.infra.tlpobj 2018-07-30 00:25:06.000000000 +0000 @@ -1,6 +1,6 @@ name texlive.infra category TLCore -revision 47951 +revision 48275 shortdesc basic TeX Live infrastructure longdesc This package contains the files needed to get the TeX Live longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus @@ -9,7 +9,7 @@ longdesc close, but not the same; it's defined in 00texlive.installer. depend texlive.infra.ARCH postaction shortcut type=menu name="TeX Live Manager" cmd=TEXDIR/bin/win32/tlmgr-gui.exe -runfiles size=243 +runfiles size=244 LICENSE.CTAN LICENSE.TL release-texlive.txt