summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-17 21:25:44 +0000
committerKarl Berry <karl@freefriends.org>2016-10-17 21:25:44 +0000
commitfd53574128b6dde54f5f7cbf551d5a1cd1703e48 (patch)
treeab000103c2da0fecb7d0e46eab49473294902535 /Master/texmf-dist/tex/luatex/luatexja
parent0ef9e5e0733974cb6927cb3512c75165998e0b59 (diff)
luatexja (17oct16)
git-svn-id: svn://tug.org/texlive/trunk@42295 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls11
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls9
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls7
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty44
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty23
7 files changed, 42 insertions, 71 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
index 1c77e829fa9..86d553a7e80 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltj-jfont.lua
@@ -953,9 +953,9 @@ luatexbase.add_to_callback(
local subtables = {}
if ft.specification then
for feat_name,v in pairs(ft.specification.features.normal) do
- if v==true then
+ if v==true and ft.resources then
for _,i in pairs(ft.resources.sequences) do
- if i.order[1]== feat_name and i.type == 'gpos_single' then
+ if i.order[1]== feat_name and i.type == 'gpos_single' and type(i.subtables)=='table' then
for _,st in pairs(i.subtables) do
subtables[st] = true
end
@@ -985,8 +985,9 @@ do
luatexbase.add_to_callback(
'luaotfload.patch_font',
function (tfmdata)
- if tfmdata.cidinfo then
- local rd = ltjr_prepare_cid_font(tfmdata.cidinfo.registry, tfmdata.cidinfo.ordering)
+ local cidinfo = tfmdata.cidinfo or tfmdata.resources.cidinfo
+ if cidinfo and cidinfo.registry and cidinfo.ordering then
+ local rd = ltjr_prepare_cid_font(cidinfo.registry, cidinfo.ordering)
if rd then
local ru, rc = rd.resources.unicodes, rd.characters
for i,v in pairs(tfmdata.characters) do
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
index df5287c668b..cf69067ba2b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsarticle.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsarticle}
- [2016/08/27 ltjsclasses ]
+ [2016/10/13 ltjsclasses ]
\def\jsc@clsname{ltjsarticle}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -477,6 +477,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\fi
\if@slide
\setlength\headsep{0\jsc@mpt}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\else
\setlength\headsep{\footskip}
\addtolength\headsep{-\topskip}
@@ -496,7 +498,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -532,7 +534,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1623,7 +1625,7 @@ class has defined the old font commands like\MessageBreak
\renewcommand\familydefault{\sfdefault}
\raggedright
\ltj@setpar@global
- \ltjsetxkanjiskip{0.1em}\relax
+ \ltjsetxkanjiskip0.1em\relax
\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
index 19a16ccbdf1..6dc0600b714 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjsbook.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjsbook}
- [2016/08/27 ltjsclasses ]
+ [2016/10/13 ltjsclasses ]
\def\jsc@clsname{ltjsbook}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -100,7 +100,6 @@
\newif\if@slide
\@slidefalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -487,6 +486,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\addtolength\headsep{-\topskip}
\else
\setlength\headsep{6\jsc@mmm}
+ \addtolength\headsep{-\topskip}%% added (2016-10-08)
+ \addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\fi
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
@@ -511,7 +512,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\else
\setlength{\textheight}{0.83\paperheight}
\fi
-\addtolength{\textheight}{-0.5\headheight}%% from -\topskip (2016-08-26); from -\headheight (2003-06-26)
+\addtolength{\textheight}{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\addtolength{\textheight}{-\headsep}
\addtolength{\textheight}{-\footskip}
\addtolength{\textheight}{-\topskip}
@@ -547,7 +548,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1708,7 +1709,7 @@ class has defined the old font commands like\MessageBreak
\renewcommand\familydefault{\sfdefault}
\raggedright
\ltj@setpar@global
- \ltjsetxkanjiskip{0.1em}\relax
+ \ltjsetxkanjiskip0.1em\relax
\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
index f7c80dff73f..0b54acc35b9 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjskiyou.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjskiyou}
- [2016/08/27 ltjsclasses ]
+ [2016/10/13 ltjsclasses ]
\def\jsc@clsname{ltjskiyou}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -98,7 +98,6 @@
\newif\if@slide
\@slidefalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -478,6 +477,8 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\fi
\setlength\headheight{0\jsc@mpt}
\setlength\headsep{0\jsc@mpt}
+\addtolength\headsep{-\topskip}%% added (2016-10-08)
+\addtolength\headsep{10\jsc@mpt}%% added (2016-10-08)
\setlength\maxdepth{.5\topskip}
\newdimen\fullwidth
\setlength\fullwidth{48\zw}
@@ -514,7 +515,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1609,7 +1610,7 @@ class has defined the old font commands like\MessageBreak
\renewcommand\familydefault{\sfdefault}
\raggedright
\ltj@setpar@global
- \ltjsetxkanjiskip{0.1em}\relax
+ \ltjsetxkanjiskip0.1em\relax
\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
index 51193a7c095..388d144ff15 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
+++ b/Master/texmf-dist/tex/luatex/luatexja/ltjspf.cls
@@ -38,7 +38,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ltjspf}
- [2016/08/27 ltjsclasses ]
+ [2016/10/13 ltjsclasses ]
\def\jsc@clsname{ltjspf}
\RequirePackage{luatexja}
\newif\if@restonecol
@@ -98,7 +98,6 @@
\newif\if@slide
\@slidefalse
\def\jsc@magscale{1}
-\DeclareOption{slide}{\@slidetrue\def\jsc@magscale{3.583}\@landscapetrue\@titlepagetrue}
\DeclareOption{8pt} {\def\jsc@magscale{0.833}}% 1.2^(-1)
\DeclareOption{9pt} {\def\jsc@magscale{0.913}}% 1.2^(-0.5}
\DeclareOption{10pt}{\def\jsc@magscale{1}}
@@ -507,7 +506,7 @@ option, since LuaTeX does not support \string\mag\MessageBreak in pdf output}%
\if@slide
\addtolength\topmargin{-\headheight}
\else
- \addtolength\topmargin{-0.5\headheight}%% from -\topskip (2016-08-17); from -\headheight (2003-06-26)
+ \addtolength\topmargin{-10\jsc@mpt}%% from -\topskip (2016-10-08); from -\headheight (2003-06-26)
\fi
\addtolength\topmargin{-\headsep}
\addtolength\topmargin{-\footskip}
@@ -1506,7 +1505,7 @@ class has defined the old font commands like\MessageBreak
\renewcommand\familydefault{\sfdefault}
\raggedright
\ltj@setpar@global
- \ltjsetxkanjiskip{0.1em}\relax
+ \ltjsetxkanjiskip0.1em\relax
\fi
\endinput
%%
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
index b679d5a436e..2aaa9d6eed8 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-fontspec.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-fontspec}[2016/03/31 Patch to fontspec for LuaTeX-ja]
+\ProvidesPackage{lltjp-fontspec}[2016/10/12 Patch to fontspec for LuaTeX-ja]
\RequirePackage{fontspec,luatexja}
\ExplSyntaxOn
@@ -24,48 +24,6 @@
}
-\cs_set_eq:NN \ltj_orig_fontspec_setup_maths: \fontspec_setup_maths:
-\cs_set:Nn \fontspec_setup_maths:
- {
- \group_begin:
- \cs_set:Npn \DeclareMathSymbol##1##2##3##4{%
- \expandafter\in@\csname sym##3\expandafter\endcsname
- \expandafter{\group@list}%
- \ifin@
- \begingroup
- \count\z@=##4\relax
- \count\tw@\count\z@
- \divide\count\z@\sixt@@n
- \count@\count\z@
- \multiply\count@\sixt@@n
- \advance\count\tw@-\count@
- \if\relax\noexpand##1% is command?
- \edef\reserved@a{\noexpand\in@{\string\mathchar}{\meaning##1}}%
- \reserved@a
- \ifin@
- \expandafter\set@mathsymbol
- \csname sym##3\endcsname##1##2%
- {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
- \@font@info{Redeclaring math symbol \string##1}%
- \else
- \expandafter\set@mathsymbol
- \csname sym##3\endcsname##1##2%
- {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
- \fi
- \else
- \expandafter\set@mathchar
- \csname sym##3\endcsname##1##2
- {\hexnumber@{\count\z@}\hexnumber@{\count\tw@}}%
- \fi
- \endgroup
- \else
- \@latex@error{Symbol font `##3' is not defined}\@eha
- \fi
- }
- \ltj_orig_fontspec_setup_maths:
- \group_end:
- }
-
%%%%%%%% shapes in \em
\cs_set:Npn \emshape { \gtfamily \itshape }
\cs_set:Npn \eminnershape { \mcfamily \upshape }
diff --git a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
index 76c983a9e7b..9ebda8a4e4f 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/patches/lltjp-geometry.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{lltjp-geometry}[2015/01/04 Patch to geometry for LuaTeX-ja with vertical writing mode]
+\ProvidesPackage{lltjp-geometry}[2016/10/06 Patch to geometry for LuaTeX-ja with vertical writing mode]
\RequirePackage{ifluatex}
\ifdefined\if@ltj@@geometry@tate\expandafter\endinput\fi
@@ -18,6 +18,7 @@
\fi
\RequirePackage{filehook}
+\RequirePackage{etoolbox}
\newif\ifGm@ltj@layoutswitch
\let\orig@PackageWarningNoLine=\PackageWarningNoLine
% define ifGm@swap@papersize if it is undefined
@@ -74,6 +75,14 @@
\define@key{Gm}{noheadfoot}[true]{\Gm@doifelse{noheadfoot}{#1}%
{\Gm@setlength\headheight\z@\Gm@defbylen{ltj@headsep}\z@
\Gm@defbylen{ltj@footskip}\z@}{}}%
+\define@key{Gm}{layoutwidth}{\Gm@layouttrue\Gm@setlength\Gm@layoutheight{#1}}%
+\define@key{Gm}{layoutheight}{\Gm@layouttrue\Gm@setlength\Gm@layoutwidth{#1}}%
+\define@key{Gm}{layoutsize}{\Gm@branch{#1}{layoutwidth}{layoutheight}}%
+\define@key{Gm}{layout}{\Gm@layouttrue\@nameuse{Gm@#1}{Gm@layout}%
+ \Gm@setlength\@tempdima{\Gm@layoutheight}%
+ \Gm@setlength\Gm@layoutheight{\Gm@layoutwidth}%
+ \Gm@setlength\Gm@layoutwidth{\@tempdima}%
+}%
% \@mparswitch は傍注の出力位置を左右ページで変えるスイッチだが,
% geometry.sty はこれを左右ページのレイアウトを変えるか否かの判定にも使っている.
@@ -141,11 +150,11 @@
\ifGm@showcrop
\vb@xt@\z@{\vskip-1\Gm@truedimen in\vskip\Gm@layoutvoffset%
\hb@xt@\z@{\hskip-1\Gm@truedimen in\hskip\Gm@layouthoffset%
- \vb@xt@\Gm@layoutheight{%
+ \vb@xt@\Gm@layoutwidth{%
\let\protect\relax
- \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}%
+ \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,1,-3,3)\hfil\Gm@cropmark(1,1,3,3)}%
\vfil
- \hb@xt@\Gm@layoutwidth{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}%
+ \hb@xt@\Gm@layoutheight{\Gm@cropmark(-1,-1,-3,-3)\hfil\Gm@cropmark(1,-1,3,-3)}}%
\hss}%
\vss}%
\fi%
@@ -412,9 +421,9 @@
\addtolength\@tempdimb{\topskip}%
\textheight\@tempdimb
\fi
- \advance\oddsidemargin\Gm@layoutvoffset%
- \advance\evensidemargin\Gm@layoutvoffset%
- \advance\topmargin\Gm@layouthoffset%
+ \advance\oddsidemargin\Gm@layouthoffset%
+ \advance\evensidemargin\Gm@layouthoffset%
+ \advance\topmargin\Gm@layoutvoffset%
\addtolength\Gm@layoutheight{\Gm@bindingoffset}%
}% end of \Gm@@process
% log