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 --- .../source/luatex/luatexja/ltjclasses.dtx | 39 +++++++++++++++++----- .../source/luatex/luatexja/ltjltxdoc.dtx | 19 +++++++++-- .../source/luatex/luatexja/ltjsclasses.dtx | 12 +++++-- 3 files changed, 56 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/source') diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx index 590ff597a24..9da4e2b748b 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjclasses.dtx @@ -5,7 +5,7 @@ % % Copyright 1995-2001 ASCII Corporation. % Copyright (c) 2010 ASCII MEDIA WORKS -% Copyright (c) 2016-2018 Japanese TeX Development Community +% Copyright (c) 2016-2020 Japanese TeX Development Community % % This file is part of the pLaTeX2e system (community edition). % ------------------------------------------------------------- @@ -123,6 +123,11 @@ % \changes{v1.8b-ltj-17}{2019/08/12}{disablejfamの``Unused global option(s)''警告を出さないようにした} % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \fi % % \iffalse @@ -152,7 +157,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2019/10/17 v1.8c-ltj-17 + [2020/01/13 v1.8e-ltj-17 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> @@ -162,12 +167,18 @@ \begingroup \suppressfontnotfounderror=1 \global\font\testfont=file:KozMinPr6N-Regular.otf + \global\font\testfonta=file:HaranoAjiMincho-Regular.otf \endgroup -\ifx\testfont\nullfont +\ifx\testfonta\nullfont\ifx\testfont\nullfont \usepackage[ipaex,nfssonly]{luatexja-preset} \else \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} +\fi\else + \usepackage[haranoaji,nfssonly]{luatexja-preset} \fi +\let\testfont\undefined\let\testfonta\undefined +\usepackage{unicode-math} +\setmathfont{Latin Modern Math} \def\pLaTeX{p\kern-.05em\LaTeX} \usepackage[unicode]{hyperref} \title{Lua\LaTeX-ja用\texttt{jclasses}互換クラス} @@ -725,10 +736,17 @@ % カーネルの定義を|\renewcommand|した後に|\MakeRobust|を使っている理由は、 % ログに |LaTeX Info: Redefining \normalsize on input line ...| という % メッセージを出したくないからです。 +% ただし、\textsf{latexrelease}パッケージで2015/01/01より +% 昔の日付に巻き戻っている場合は|\MakeRobust|が定義されていません。 % \changes{v1.8c}{2019/10/17}{フォントサイズ変更命令をrobustに % (sync with classes.dtx 2019/08/27 v1.4j)} +% \changes{v1.8d}{2019/10/25}{Don't use \cs{MakeRobust} if +% in rollback prior to 2015 +% (sync with classes.dtx 2019/10/25 v1.4k)} % \begin{macrocode} -\MakeRobust\normalsize +\ifx\MakeRobust\@undefined \else + \MakeRobust\normalsize +\fi % \end{macrocode} % \end{macro} % \end{macro} @@ -3485,17 +3503,20 @@ % itemize環境のそれぞれの項目のラベルは、 % |\labelenumi| \ldots\ |\labelenumiv|で生成されます。 % \changes{v1.1a}{1997/01/28}{Bug fix: \cs{labelitemii}.} +% \changes{v1.8e}{2020/01/03}{Normalize label fonts +% (sync with classes.dtx 2019/12/20 v1.4l)} % \begin{macrocode} -\newcommand{\labelitemi}{\textbullet} +\newcommand{\labelitemi}{\labelitemfont \textbullet} \newcommand{\labelitemii}{% \ifnum\ltjgetparameter{direction}=3 - {\textcircled{~}} + {\labelitemfont \textcircled{~}} \else - {\normalfont\bfseries\textendash} + {\labelitemfont \bfseries\textendash} \fi } -\newcommand{\labelitemiii}{\textasteriskcentered} -\newcommand{\labelitemiv}{\textperiodcentered} +\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered} +\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered} +\newcommand\labelitemfont{\normalfont} % \end{macrocode} % \end{macro} % \end{macro} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx index 0a5c2b370f3..9d4bf2114a8 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjltxdoc.dtx @@ -4,8 +4,11 @@ % Original: jltxdoc.dtx % % Copyright 1995,1996,1997 ASCII Corporation. +% Copyright (c) 2010 ASCII MEDIA WORKS +% Copyright (c) 2016 Japanese TeX Development Community +% Copyright (c) 2016-2017 Japanese TeX Development Community % -% This file is part of pLaTeX2e system. +% This file is part of the pLaTeX2e system (community edition). % ------------------------------------- % % \fi @@ -31,7 +34,19 @@ %<*driver> \documentclass{ltjltxdoc} \GetFileInfo{ltjltxdoc.cls} -\usepackage[kozuka-pr6n]{luatexja-preset} +\begingroup + \suppressfontnotfounderror=1 + \global\font\testfont=file:KozMinPr6N-Regular.otf + \global\font\testfonta=file:HaranoAjiMincho-Regular.otf +\endgroup +\ifx\testfonta\nullfont\ifx\testfont\nullfont + \usepackage[ipaex,nfssonly]{luatexja-preset} +\else + \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} +\fi\else + \usepackage[haranoaji,nfssonly]{luatexja-preset} +\fi +\let\testfont\undefined\let\testfonta\undefined \usepackage{unicode-math} \setmathfont{Latin Modern Math} \title{Lua\LaTeX-jaドキュメント記述用クラス} diff --git a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx index be67a2f68e7..f00552dfd81 100644 --- a/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx +++ b/Master/texmf-dist/source/luatex/luatexja/ltjsclasses.dtx @@ -44,7 +44,7 @@ %<*driver> \ProvidesFile{ltjsclasses.dtx} % - [2019/08/12 ltjsclasses ] + [2019/11/23 ltjsclasses ] %<*driver> \IfFileExists{luatex85.sty}{\RequirePackage{luatex85}}{} \documentclass[disablejfam]{ltjsarticle} @@ -53,12 +53,18 @@ \begingroup \suppressfontnotfounderror=1 \global\font\testfont=file:KozMinPr6N-Regular.otf + \global\font\testfonta=file:HaranoAjiMincho-Regular.otf \endgroup -\ifx\testfont\nullfont +\ifx\testfonta\nullfont\ifx\testfont\nullfont \usepackage[ipaex,nfssonly]{luatexja-preset} \else \usepackage[kozuka-pr6n,nfssonly]{luatexja-preset} -\fi +\fi\else + \usepackage[haranoaji,nfssonly]{luatexja-preset} +\fi +\let\testfont\undefined\let\testfonta\undefined +\usepackage{unicode-math} +\setmathfont{Latin Modern Math} \ltjsetparameter{alxspmode={`\*,allow}} \ltjsetparameter{alxspmode={`\\,allow}} %%%%\usepackage{unicode-math} -- cgit v1.2.3