From 26142dfa8cafe366a32dff1459c8f0f4c60c83d3 Mon Sep 17 00:00:00 2001 From: Hironori Kitagawa Date: Mon, 12 Aug 2019 19:16:03 +0900 Subject: [PATCH] microtype --- src/ltjarticle.cls | 2 +- src/ltjbk10.clo | 2 +- src/ltjbk11.clo | 2 +- src/ltjbk12.clo | 2 +- src/ltjbook.cls | 2 +- src/ltjclasses.dtx | 2 +- src/ltjreport.cls | 2 +- src/ltjsize10.clo | 2 +- src/ltjsize11.clo | 2 +- src/ltjsize12.clo | 2 +- src/ltjtarticle.cls | 2 +- src/ltjtbk10.clo | 2 +- src/ltjtbk11.clo | 2 +- src/ltjtbk12.clo | 2 +- src/ltjtbook.cls | 2 +- src/ltjtreport.cls | 2 +- src/ltjtsize10.clo | 2 +- src/ltjtsize11.clo | 2 +- src/ltjtsize12.clo | 2 +- src/patches/lltjp-microtype.sty | 18 +++++++++++++++--- 20 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/ltjarticle.cls b/src/ltjarticle.cls index 01782e5..98945f4 100644 --- a/src/ltjarticle.cls +++ b/src/ltjarticle.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjarticle} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjbk10.clo b/src/ltjbk10.clo index 18d5961..ab67293 100644 --- a/src/ltjbk10.clo +++ b/src/ltjbk10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjbk11.clo b/src/ltjbk11.clo index 8265b54..86ddc44 100644 --- a/src/ltjbk11.clo +++ b/src/ltjbk11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjbk12.clo b/src/ltjbk12.clo index ae7da1c..df2a6c9 100644 --- a/src/ltjbk12.clo +++ b/src/ltjbk12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjbk12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjbook.cls b/src/ltjbook.cls index e616992..280da3a 100644 --- a/src/ltjbook.cls +++ b/src/ltjbook.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjbook} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjclasses.dtx b/src/ltjclasses.dtx index ccecd0d..c593ce6 100644 --- a/src/ltjclasses.dtx +++ b/src/ltjclasses.dtx @@ -151,7 +151,7 @@ %<11pt&bk>\ProvidesFile{ltjtbk11.clo} %<12pt&bk>\ProvidesFile{ltjtbk12.clo} % - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 % Standard LuaLaTeX-ja class] %<10pt|11pt|12pt> Standard LuaLaTeX-ja file (size option)] %<*driver> diff --git a/src/ltjreport.cls b/src/ltjreport.cls index 4ab0136..4b46fb5 100644 --- a/src/ltjreport.cls +++ b/src/ltjreport.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjreport} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjsize10.clo b/src/ltjsize10.clo index 0fd6055..601be87 100644 --- a/src/ltjsize10.clo +++ b/src/ltjsize10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{15}% diff --git a/src/ltjsize11.clo b/src/ltjsize11.clo index d2445e4..fcc0f72 100644 --- a/src/ltjsize11.clo +++ b/src/ltjsize11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{15.5}% diff --git a/src/ltjsize12.clo b/src/ltjsize12.clo index c8e3ca6..4e1ad87 100644 --- a/src/ltjsize12.clo +++ b/src/ltjsize12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjsize12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{16.5}% diff --git a/src/ltjtarticle.cls b/src/ltjtarticle.cls index 6b6f254..4f54235 100644 --- a/src/ltjtarticle.cls +++ b/src/ltjtarticle.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtarticle} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjtbk10.clo b/src/ltjtbk10.clo index 61825f2..60ee4fa 100644 --- a/src/ltjtbk10.clo +++ b/src/ltjtbk10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtbk11.clo b/src/ltjtbk11.clo index 1db86d1..9b4067c 100644 --- a/src/ltjtbk11.clo +++ b/src/ltjtbk11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtbk12.clo b/src/ltjtbk12.clo index 72f2116..1b3f553 100644 --- a/src/ltjtbk12.clo +++ b/src/ltjtbk12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtbk12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/src/ltjtbook.cls b/src/ltjtbook.cls index 1ffa36f..328fd0f 100644 --- a/src/ltjtbook.cls +++ b/src/ltjtbook.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtbook} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjtreport.cls b/src/ltjtreport.cls index c0a32f9..041e935 100644 --- a/src/ltjtreport.cls +++ b/src/ltjtreport.cls @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{ltjtreport} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja class] \RequirePackage{luatexja} \newcounter{@paper} diff --git a/src/ltjtsize10.clo b/src/ltjtsize10.clo index 6fe390a..1bb6c8b 100644 --- a/src/ltjtsize10.clo +++ b/src/ltjtsize10.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize10.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xpt{17}% diff --git a/src/ltjtsize11.clo b/src/ltjtsize11.clo index 0268322..2258dbc 100644 --- a/src/ltjtsize11.clo +++ b/src/ltjtsize11.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize11.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xipt{17}% diff --git a/src/ltjtsize12.clo b/src/ltjtsize12.clo index 5f5d5ec..645f6ce 100644 --- a/src/ltjtsize12.clo +++ b/src/ltjtsize12.clo @@ -24,7 +24,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesFile{ltjtsize12.clo} - [2019/04/06 v1.8b-ltj-16 + [2019/08/12 v1.8b-ltj-17 Standard LuaLaTeX-ja file (size option)] \renewcommand{\normalsize}{% \@setfontsize\normalsize\@xiipt{18}% diff --git a/src/patches/lltjp-microtype.sty b/src/patches/lltjp-microtype.sty index 740474c..db2fac8 100644 --- a/src/patches/lltjp-microtype.sty +++ b/src/patches/lltjp-microtype.sty @@ -1,5 +1,5 @@ % -% lltjp-microtype.sty 2019-07-12 +% lltjp-microtype.sty 2019-08-12 % % (Work in Progress) % @@ -9,12 +9,24 @@ \makeatletter \def\MT@register@font{% - \xdef\MT@font@list{\expandonce{\MT@font@list}\MT@font,}% + \xdef\MT@font@list{\expandonce{\MT@font@list\MT@font},}% !!! } \def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list \ifMT@inlist@\else - \xdef\MT@font@list{\expandonce{\MT@font@list}\font@name,}% + \xdef\MT@font@list{\expandonce{\MT@font@list\font@name},}% !!! \fi} +\let\ltj@MT@tracking@\MT@tracking@ +\def\MT@tracking@{% + \MT@exp@one@n\MT@in@clist\MT@font\MT@tr@font@list + \ifMT@inlist@\else + \MT@maybe@do{tr}% + \ifMT@do\else + \xdef\MT@tr@font@list{\expandonce{\MT@tr@font@list\MT@font,}}% !!! + \fi + \fi +} +\ifx\MT@tracking\ltj@MT@tracking@\let\MT@tracking\MT@tracking@\fi + %\endinput \begingroup -- 2.11.0