texlive[53739] Master: luatexja (9feb20)

commits+karl at tug.org commits+karl at tug.org
Sun Feb 9 23:10:04 CET 2020


Revision: 53739
          http://tug.org/svn/texlive?view=revision&revision=53739
Author:   karl
Date:     2020-02-09 23:10:04 +0100 (Sun, 09 Feb 2020)
Log Message:
-----------
luatexja (9feb20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/luatex/luatexja/README
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
    trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
    trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
    trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
    trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/README
===================================================================
--- trunk/Master/texmf-dist/doc/luatex/luatexja/README	2020-02-09 22:07:48 UTC (rev 53738)
+++ trunk/Master/texmf-dist/doc/luatex/luatexja/README	2020-02-09 22:10:04 UTC (rev 53739)
@@ -1,4 +1,4 @@
-The LuaTeX-ja Package 20200127.0
+The LuaTeX-ja Package 20200209.0
 --------------------------------
 Copyright (c) 2011--2020 The LuaTeX-ja project
 License: modified BSD (see COPYING)
@@ -43,9 +43,9 @@
 2. If you must/want to install manually:
 
    a. Download the source archive from CTAN,
-      or tagged as 20200127.0 in the Git repository by
+      or tagged as 20200209.0 in the Git repository by
       <http://git.osdn.jp/view?p=luatex-ja/luatexja.git
-                              ;a=snapshot;h=refs/tags/20200127.0;sf=tgz>
+                              ;a=snapshot;h=refs/tags/20200209.0;sf=tgz>
 
    b. Extract the archive and process following three files by LuaLaTeX
       to generate classes for Japanese typesetting:
@@ -93,4 +93,4 @@
 
 * src/*.{ins.dtx} and src/ltj-kinsoku_make.tex are not needed in regular use.
 
-Last commit date: Mon Jan 27 16:16:24 2020 +0900
+Last commit date: Sun Feb 9 22:23:24 2020 +0900

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-en.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/luatex/luatexja/luatexja-ja.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2020-02-09 22:07:48 UTC (rev 53738)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/luatexja.sty	2020-02-09 22:10:04 UTC (rev 53739)
@@ -41,7 +41,7 @@
   \ProcessOptions\relax
 \fi                             %</LaTeX>
 %%%% VERSION
-\def\LuaTeXjaversion{20200127.0}
+\def\LuaTeXjaversion{20200209.0}
 
 \directlua{require('ltj-unicode-ccfix.lua')}% catcode of ideographs
 

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty	2020-02-09 22:07:48 UTC (rev 53738)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjdefs.sty	2020-02-09 22:10:04 UTC (rev 53739)
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjdefs}[2019/09/26 Default font settings of LuaTeX-ja]
+\ProvidesPackage{lltjdefs}[2020/02/07 Default font settings of LuaTeX-ja]
 
 \ifdefined\ltj at stdmcfont\else\def\ltj at stdmcfont{IPAExMincho}\fi
 \ifdefined\ltj at stdgtfont\else\def\ltj at stdgtfont{IPAExGothic}\fi
@@ -32,7 +32,7 @@
 \newcommand\kanjiencodingdefault{JY3}
 \newcommand\kanjifamilydefault{\mcdefault}
 \newcommand\kanjiseriesdefault{\mddefault}
-\ifdefined\shapedefault
+\ifdefined\@rmfamilyhook
   %% LaTeX 2020-02-02
   \newcommand\kanjishapedefault{\shapedefault}
 \else
@@ -105,7 +105,7 @@
 	  \expandafter\patchcmd\csname #1 \endcsname{\selectfont}{#2\selectfont}{}{}%
 	\else
 	  \PackageWarningNoLine{luatexja}{%
-		Patching to \expandafter\string\csname #1\endcsname\space failed
+		Patching to \expandafter\string\csname #1\endcsname\space failed%
 	  }%
 	\fi
   \fi

Modified: trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty
===================================================================
--- trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty	2020-02-09 22:07:48 UTC (rev 53738)
+++ trunk/Master/texmf-dist/tex/luatex/luatexja/patches/lltjfont.sty	2020-02-09 22:10:04 UTC (rev 53739)
@@ -3,7 +3,7 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjfont}[2020/01/26 Patch to NFSS2 for LuaTeX-ja]
+\ProvidesPackage{lltjfont}[2020/02/07 Patch to NFSS2 for LuaTeX-ja]
 
 %% patching \DeclareTextComposite
 \def\ltj at chardef@text at cmd#1{%
@@ -572,58 +572,59 @@
 %%%% LaTeX 2020-02-02
 \DeclareRobustCommand\romanseriesforce[1]{\edef\f at series{#1}}
 \DeclareRobustCommand\kanjiseriesforce[1]{\edef\k at series{#1}}
-\DeclareRobustCommand\fontseriesforce[1]{\kanjiseries{#1}\romanseries{#1}}
+\DeclareRobustCommand\fontseriesforce[1]{\kanjiseriesforce{#1}\romanseriesforce{#1}}
 \DeclareRobustCommand\romanshapeforce[1]{\edef\f at shape{#1}}
 \DeclareRobustCommand\kanjishapeforce[1]{\edef\k at shape{#1}}
-\DeclareRobustCommand\fontshapeforce[1]{\kanjishape{#1}\romanshape{#1}}
+\DeclareRobustCommand\fontshapeforce[1]{\kanjishapeforce{#1}\romanshapeforce{#1}}
 
-\def\merge at font@kanji at series#1{%
+\def\merge at kanji@series#1{%
   \expandafter\expandafter\expandafter
-  \merge at font@kanji at series@
+  \merge at kanji@series@
     \csname series@\k at series @#1\endcsname
     {#1}%
     \@nil
 }
-\def\set at target@kanji at series#1{%
+\def\set at target@series at kanji#1{%
     \edef\k at series{#1}%
     \edef\k at series{\expandafter\series at drop@one at m\k at series mm\series at drop@one at m}%
 }
-\def\merge at font@kanji at series@#1#2#3\@nil{%
-  \def\@reserveda{#3}%
-  \ifx\@reserveda\@empty
-    \set at target@kanji at series{#2}%
+\def\merge at kanji@series@#1#2#3\@nil{%
+  \def\reserved at a{#3}%
+  \ifx\reserved at a\@empty
+    \set at target@series at kanji{#2}%
   \else
     \begingroup\let\f at encoding\k at encoding\let\f at family\k at family
 	   \maybe at load@fontshape\endgroup
-    \edef\@reserveda{\k at encoding /\k at family /#1/\k at shape}%
-     \ifcsname \@reserveda \endcsname
-       \set at target@kanji at series{#1}%
+    \edef\reserved at a{\k at encoding /\k at family /#1/\k at shape}%
+     \ifcsname \reserved at a \endcsname
+       \set at target@series at kanji{#1}%
     \else
        \ifcsname \k at encoding /\k at family /#2/\k at shape \endcsname
-         \set at target@kanji at series{#2}%
+         \set at target@series at kanji{#2}%
          {\let\curr at fontshape\curr at kfontshape\@font at shape@subst at warning}%
        \else
-         \set at target@kanji at series{#3}%
+         \set at target@series at kanji{#3}%
          {\let\curr at fontshape\curr at kfontshape\@font at shape@subst at warning}%
        \fi
     \fi
   \fi
 }
-\def\merge at font@kanji at shape#1{%
+\def\merge at kanji@shape#1{%
   \expandafter\expandafter\expandafter
-  \merge at font@kanji at shape@
+  \merge at kanji@shape@
     \csname shape@\k at shape @#1\endcsname
     {#1}%
     \@nil
 }
-\def\merge at font@kanji at shape@#1#2#3\@nil{%
-  \def\@reserveda{#3}%
-  \ifx\@reserveda\@empty
+\def\merge at kanji@shape@#1#2#3\@nil{%
+  \def\reserved at a{#3}%
+  \ifx\reserved at a\@empty
     \edef\k at shape{#2}%
   \else
-    \maybe at load@fontshape
-    \edef\@reserveda{\k at encoding /\k at family /\k at series/#1}%
-     \ifcsname \@reserveda\endcsname
+    \begingroup\let\f at encoding\k at encoding\let\f at family\k at family
+	   \maybe at load@fontshape\endgroup
+    \edef\reserved at a{\k at encoding /\k at family /\k at series/#1}%
+     \ifcsname \reserved at a\endcsname
        \edef\k at shape{#1}%
     \else
        \ifcsname \k at encoding /\k at family /\k at series/#2\endcsname
@@ -637,13 +638,19 @@
   \fi
 }
 \DeclareRobustCommand\romanseries[1]{\merge at font@series{#1}}
-\DeclareRobustCommand\kanjiseries[1]{\merge at font@kanji at series{#1}}
+\DeclareRobustCommand\kanjiseries[1]{\merge at kanji@series{#1}}
 \DeclareRobustCommand\fontseries[1]{%
-   \merge at font@series{#1}\merge at font@kanji at series{#1}}
+   \merge at font@series{#1}\merge at kanji@series{#1}}
 \DeclareRobustCommand\romanshape[1]{\merge at font@shape{#1}}
-\DeclareRobustCommand\kanjishape[1]{\merge at font@kanji at shape{#1}}
+\DeclareRobustCommand\kanjishape[1]{\merge at kanji@shape{#1}}
 \DeclareRobustCommand\fontshape[1]{%
-   \merge at font@shape{#1}\merge at font@kanji at shape{#1}}
+   \merge at font@shape{#1}\merge at kanji@shape{#1}}
+\DeclareRobustCommand\usekanji[4]{%
+    \kanjiencoding{#1}\edef\k at family{#2}\edef\k at series{#3}\edef\k at shape{#4}%
+    \selectfont\ignorespaces}
+\DeclareRobustCommand\useroman[4]{%
+    \romanencoding{#1}\edef\f at family{#2}\edef\f at series{#3}\edef\f at shape{#4}%
+    \selectfont\ignorespaces}
 \else
 %%%% LaTeX 2019-10-01
 \DeclareRobustCommand\romanseries[1]{\edef\f at series{#1}}
@@ -652,8 +659,6 @@
 \DeclareRobustCommand\romanshape[1]{\edef\f at shape{#1}}
 \DeclareRobustCommand\kanjishape[1]{\edef\k at shape{#1}}
 \DeclareRobustCommand\fontshape[1]{\kanjishape{#1}\romanshape{#1}}
-\fi
-%%%%
 \DeclareRobustCommand\usekanji[4]{%
     \kanjiencoding{#1}\kanjifamily{#2}\kanjiseries{#3}\kanjishape{#4}%
     \selectfont\ignorespaces}
@@ -660,6 +665,8 @@
 \DeclareRobustCommand\useroman[4]{%
     \romanencoding{#1}\romanfamily{#2}\romanseries{#3}\romanshape{#4}%
     \selectfont\ignorespaces}
+\fi
+%%%%
 \protected\def\usefont#1#2#3#4{%
   \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{#1}')}\ifin@%
   \usekanji{#1}{#2}{#3}{#4}%
@@ -675,13 +682,18 @@
 %%%% LaTeX 2020-02-02
 \let\prepare at family@series at update@kanji=\prepare at family@series at update
 \patchcmd\prepare at family@series at update{\fontfamily}{\romanfamily}{}{}
+\patchcmd\prepare at family@series at update@kanji{\update at series@target at value}{\update at series@target at value@kanji}{}{}
+\patchcmd\prepare at family@series at update@kanji{\@meta at family@list}{\@meta at family@list at kanji}{}{}
 \patchcmd\prepare at family@series at update@kanji{\fontfamily}{\kanjifamily}{}{}
-\patchcmd\prepare at family@series at update@kanji{\f at series}{\k at series}{}{}
 \patchcmd\prepare at family@series at update@kanji{\maybe at load@fontshape}
   {\begingroup\let\f at encoding\k at encoding\let\f at family\k at family
     \maybe at load@fontshape\endgroup}{}{}
-\patchcmd\prepare at family@series at update@kanji{\@meta at family@list}{\@meta at family@kanji at list}{}{}
-\def\@meta at family@kanji at list{\@elt{mc}\@elt{gt}\@elt{jtt}}
+\patchcmd\prepare at family@series at update@kanji{\f at series}{\k at series}{}{}
+\let\update at series@target at value@kanji=\update at series@target at value
+\patchcmd\update at series@target at value@kanji{\f at family}{\k at family}{}{}
+\patchcmd\update at series@target at value@kanji{\f at series}{\k at series}{}{}
+
+\def\@meta at family@list at kanji{\@elt{mc}\@elt{gt}\@elt{jtt}}
 \DeclareRobustCommand\bfseries{%
   \not at math@alphabet\bfseries\mathbf
   \expand at font@defaults

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2020-02-09 22:07:48 UTC (rev 53738)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2020-02-09 22:10:04 UTC (rev 53739)
@@ -689,6 +689,7 @@
  'lecturer',    "&MAKEflatten",
  'ledmpar',     "die 'skipping, use ledmac'",
  'ledpar',      "die 'skipping, use ledmac'",
+ 'leiletter',	"die 'skipping, nonfree font (minion)'",
  'letter1',     "die 'skipping, ca.1989, never in TL, await request'",
  'lettrgth',    "die 'skipping, nonfree font'",
  'lettrine',    "&MAKEflatten",



More information about the tex-live-commits mailing list.