From f5dc95456cfd50e1e65093613f2dcab3e30b6714 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Jan 2020 21:56:42 +0000 Subject: luatexja (27jan20) git-svn-id: svn://tug.org/texlive/trunk@53575 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/luatex/luatexja/README | 14 +- .../doc/luatex/luatexja/lltjp-geometry.pdf | Bin 140622 -> 164326 bytes .../doc/luatex/luatexja/lltjp-geometry.tex | 22 +-- .../texmf-dist/doc/luatex/luatexja/ltjclasses.pdf | Bin 408500 -> 392691 bytes .../texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf | Bin 68494 -> 69351 bytes .../texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf | Bin 504115 -> 455647 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-en.pdf | Bin 530396 -> 531845 bytes .../texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf | Bin 935894 -> 939105 bytes .../doc/luatex/luatexja/luatexja-ruby.pdf | Bin 394907 -> 485933 bytes .../doc/luatex/luatexja/luatexja-ruby.tex | 53 +++--- Master/texmf-dist/doc/luatex/luatexja/luatexja.dtx | 194 +++++++++++---------- .../source/luatex/luatexja/ltjclasses.dtx | 39 ++++- .../source/luatex/luatexja/ltjltxdoc.dtx | 19 +- .../source/luatex/luatexja/ltjsclasses.dtx | 12 +- .../luatexja/addons/luatexja-fontspec-27c.sty | 15 +- .../tex/luatex/luatexja/addons/luatexja-preset.sty | 136 ++++++++------- .../texmf-dist/tex/luatex/luatexja/ltj-jfmglue.lua | 126 ++++++------- Master/texmf-dist/tex/luatex/luatexja/ltj-math.lua | 32 ++-- .../texmf-dist/tex/luatex/luatexja/ltjarticle.cls | 13 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk10.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk11.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjbk12.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjbook.cls | 13 +- .../texmf-dist/tex/luatex/luatexja/ltjreport.cls | 13 +- .../texmf-dist/tex/luatex/luatexja/ltjsarticle.cls | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsize10.clo | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjsize11.clo | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjsize12.clo | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjskiyou.cls | 2 +- Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjsreport.cls | 2 +- .../texmf-dist/tex/luatex/luatexja/ltjtarticle.cls | 13 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk10.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk11.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbk12.clo | 6 +- Master/texmf-dist/tex/luatex/luatexja/ltjtbook.cls | 13 +- .../texmf-dist/tex/luatex/luatexja/ltjtreport.cls | 13 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize10.clo | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize11.clo | 6 +- .../texmf-dist/tex/luatex/luatexja/ltjtsize12.clo | 6 +- .../tex/luatex/luatexja/luatexja-core.sty | 18 +- Master/texmf-dist/tex/luatex/luatexja/luatexja.lua | 24 +-- Master/texmf-dist/tex/luatex/luatexja/luatexja.sty | 4 +- .../tex/luatex/luatexja/patches/lltjcore.sty | 1 + .../tex/luatex/luatexja/patches/lltjdefs.sty | 72 +++++--- .../tex/luatex/luatexja/patches/lltjfont.sty | 185 ++++++++++++++++++-- .../tex/luatex/luatexja/patches/lltjp-fontspec.sty | 100 +++-------- 48 files changed, 731 insertions(+), 495 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/luatex/luatexja/README b/Master/texmf-dist/doc/luatex/luatexja/README index ecd65df1e40..f0d4a0e9b48 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/README +++ b/Master/texmf-dist/doc/luatex/luatexja/README @@ -1,6 +1,6 @@ -The LuaTeX-ja Package 20191118.0 +The LuaTeX-ja Package 20200127.0 -------------------------------- -Copyright (c) 2011--2019 The LuaTeX-ja project +Copyright (c) 2011--2020 The LuaTeX-ja project License: modified BSD (see COPYING) LuaTeX-ja is a macro package for typesetting Japanese documents with LuaTeX. @@ -22,7 +22,7 @@ Installation 0. Please make sure that your TeX distribution is up-to-date. This version of LuaTeX-ja requires - - LuaTeX 1.0.0 or later + - LuaTeX 1.07.0 (or later) - luaotfload (v3.1 or later recommended) - adobemapping (Adobe CMap files) - everysel package @@ -38,14 +38,14 @@ Installation One might be able to typeset documents without an error, but with some unwanted results. -1. If you are using TeX Live 2019 or later, you can install LuaTeX-ja via tlmgr. +1. If you are using TeX Live 2019, you can install LuaTeX-ja via tlmgr. 2. If you must/want to install manually: a. Download the source archive from CTAN, - or tagged as 20191118.0 in the Git repository by + or tagged as 20200127.0 in the Git repository by + ;a=snapshot;h=refs/tags/20200127.0;sf=tgz> b. Extract the archive and process following three files by LuaLaTeX to generate classes for Japanese typesetting: @@ -93,4 +93,4 @@ Notes * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use. -Last commit date: Mon Nov 18 21:38:16 2019 +0900 +Last commit date: Mon Jan 27 16:16:24 2020 +0900 diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf index 2f0d74960c1..1ff22ae348b 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf and b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex index 2006e4994ed..1b2aa5ed596 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex +++ b/Master/texmf-dist/doc/luatex/luatexja/lltjp-geometry.tex @@ -1,17 +1,17 @@ -%#! luajitlatex +%#! lualatex \documentclass[a4paper,10pt]{ltjsarticle} \usepackage[textwidth=45\zw, lines=45, footskip=2\zh, verbose]{geometry} -\usepackage{listings,amsmath,booktabs,lltjext} -\usepackage[match]{luatexja-fontspec} +\usepackage{listings,amsmath,booktabs,lltjext,bxghost} \usepackage{unicode-math} -\setmathfont{XITS Math} -\setmainfont{TeX Gyre Termes} -\setsansfont[Scale=0.95]{TeX Gyre Heros} -\usepackage[kozuka-pr6n]{luatexja-preset}\normalsize +\setmathfont{Latin Modern Math} +\usepackage[match]{luatexja-fontspec} +\usepackage[haranoaji]{luatexja-preset} +\setmonojfont{HaranoAjiGothic-Regular} +\normalsize \def\emph#1{\textbf{\textgt{\mathversion{bold}#1}}} \def\headfont{\normalfont\bfseries\gtfamily} \def\pTeX{p\kern-.05em\TeX} -\def\cs#1{\text{\texttt{\char`\\#1}}} +\def\cs#1{\text{\eghostguarded{\texttt{\char`\\#1}}}} \protected\def\Pkg#1{\textsf{#1}} \protected\def\>{\hskip\ltjgetparameter{xkanjiskip}} \lstset{ @@ -244,7 +244,7 @@ $5\,\textrm{pt} + 3.41666\,\textrm{pt}=8.41666\,\textrm{pt}$である.} \Pkg{lltjp-geometry}では \begin{quote} \texttt{lines}オプション指定時,\cs{topskip}の値を最低でも - \emph{\cs{tstrutbox}の高さ($\cs{baselineskip}/2$)}まで引き上げる + \emph{\cs{tstrutbox}の高さ}($\cs{baselineskip}/2$)まで引き上げる \end{quote} という挙動にした.見かけ上は\cs{topskip}の値制限が緩くなったが,前節で述べたように 欧文フォントのベースラインは和文に合うように下にずらされるので, @@ -278,8 +278,8 @@ $5\,\textrm{pt} + 3.41666\,\textrm{pt}=8.41666\,\textrm{pt}$である.} \cs{topskip}だけ左にずれたところにあり, 一方ページの最終行のベースラインは本文領域の左端にある. 縦組和文フォントのベースラインは文字の左右中央を通ることから, -従って,\emph{見た目で言えば,右余白の方が$\cs{topskip}=8.5\,\textrm{pt}$だけ -大きい}ということになってしまう\footnote{% +従って,\emph{見た目で言えば,右余白の方が\cs{topskip}}~($=8.5\,\textrm{pt}$)% +\emph{だけ大きい}ということになってしまう\footnote{% 同様に,横組で \texttt{vcentering}を指定すると,見かけでは $\cs{topskip}-\cs{Cht}+\cs{Cdp}$だけ上余白が大きいように見える. }. diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf index d2ba59b0056..82b5a12e8a0 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf index f963ecb7677..2fbbb676641 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjltxdoc.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf index 43d9e9b1c38..e7b415f52bd 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf and b/Master/texmf-dist/doc/luatex/luatexja/ltjsclasses.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf index eb9e2513e30..5a23c46595b 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf index 4be46efdc5d..15bf08d2415 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf index 935ed02930f..2c11e1f7749 100644 Binary files a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf and b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.pdf differ diff --git a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex index 4d4be4f4f11..40657a363f4 100644 --- a/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex +++ b/Master/texmf-dist/doc/luatex/luatexja/luatexja-ruby.tex @@ -1,16 +1,20 @@ -%#! luajitlatex +%#! lualatex %%% a test of ruby. \documentclass[a4paper,10pt]{ltjsarticle} -\usepackage{luatexja-otf,amsmath} +\usepackage{luatexja-otf,amsmath,bxghost} +\usepackage[no-math]{fontspec} \usepackage[match]{luatexja-fontspec} -\usepackage[kozuka-pr6n]{luatexja-preset}\normalsize +\usepackage[haranoaji]{luatexja-preset}\normalsize +\setmonojfont{HaranoAjiGothic-Regular.otf} +\usepackage{unicode-math} +\setmathfont{Latin Modern Math} + \def\emph#1{\textbf{\textgt{#1}}} \def\headfont{\normalfont\bfseries\gtfamily} -\setmonojfont{KozGoPr6N-Regular.otf} - -\usepackage[textwidth=45\zw, lines=45, footskip=6mm]{geometry} +\def\cs#1{\eghostguarded{\texttt{\textbackslash#1}}} +\usepackage[textwidth=45\zw, lines=45, footskip=2\zh]{geometry} \advance\leftmargini-1\zw\advance\leftmarginii-1\zw -\protected\def\Param#1{\underline{\smash{\textsf{\mdseries #1}}}} +\protected\def\Param#1{\eghostguarded{\underline{\smash{\textsf{\mdseries #1}}}}} \usepackage{luatexja-ruby,showexpl,booktabs} \lstset{ @@ -30,17 +34,17 @@ } \def\Node#1#2{\,\vcenter{\hbox{\fboxsep=1pt\fbox{\vbox{\small\halign{\hfil##\hfil\cr - #1\mathstrut\cr\noalign{\hrule height.4pt}\strut#2\cr}}}}\,}} + #1\mathstrut\cr\noalign{\smallskip\hrule height.4pt\smallskip}\strut\<#2\cr}}}}}\,} \def\LuaTeX{Lua\TeX} % 三分ルビ用 \DeclareFontShape{JY3}{mc}{mc}{n}{<-> [0.92487] - KozMinPr6N-Regular:extend=0.67;jfm=ujisc33}{} + HaranoAjiMincho-Regular:extend=0.67;jfm=ujisc33}{} \title{\textsf{luatexja-ruby}パッケージ} \begin{document} \catcode`\<=13 -\def<#1>{{\normalfont\rm\itshape$\langle$#1\/$\rangle$}} +\def<#1>{{\rmfamily\mdseries\itshape$\langle$#1\/$\rangle$}} %\fontsize{13.19873}{15}\selectfont% \maketitle @@ -76,17 +80,17 @@ plain \LuaTeX でのロードはまだサポートしておらず, \end{quotation} \subsection{\ruby{命|令}{めい|れい}} -\paragraph{\tt\textbackslash ltjruby} +\paragraph{\cs{ltjruby}} ルビ出力用命令の本体.\verb+\ruby+ という別名を定義している. \begin{quote} -\tt \textbackslash ltjruby[