summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-06 23:28:44 +0000
committerKarl Berry <karl@freefriends.org>2014-02-06 23:28:44 +0000
commitc33fed8d37bc51a8a9ff5a5f1a806dac56765c8d (patch)
treef95a9e2a7ddf6ffa449a8d74ecaca762ab845c09 /Master/texmf-dist/tex/luatex/luatexja/addons
parent55bbd0a3dd6e4f70a9cae6283e0e84b2aba02989 (diff)
luatexja (4feb14)
git-svn-id: svn://tug.org/texlive/trunk@32895 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexja/addons')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty35
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty58
2 files changed, 40 insertions, 53 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
index a9262106618..cdfad90572b 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
@@ -82,7 +82,6 @@
\expandafter\endinput\fi\relax
%%------------------
-\RequirePackage{expl3}
%! Main part of luatexja-adjust
\RequireLuaTeXjaSubmodule{adjust}
@@ -95,23 +94,23 @@
\ifltj@japaram@adjust\ltjenableadjust\else\ltjdisableadjust\fi
}
-\ExplSyntaxOn
-\cs_new:Nn \ltj_adjust_inittable: {
- % To be filled...
-}
-\cs_new:Nn \ltj_adjust_appendtable:n {
- % To be filled
-}
-
-\clist_new:N \l_ltj_adjust_priority
-\define@key[ltj]{japaram}{adjustpriority}{% COMMA LIST
- \clist_set:Nx \l_ltj_adjust_priority {#1}
- \ltj_adjust_inittable:
- \clist_map_function:NN \l_ltj_adjust_priority \ltj_adjust_appendtable:n
-}
-
-\ExplSyntaxOff
-
+\ifltj@in@latex
+ \RequirePackage{expl3}
+ \ExplSyntaxOn
+ \cs_new:Nn \ltj_adjust_inittable: {
+ % To be filled...
+ }
+ \cs_new:Nn \ltj_adjust_appendtable:n {
+ % To be filled
+ }
+ \clist_new:N \l_ltj_adjust_priority
+ \define@key[ltj]{japaram}{adjustpriority}{% COMMA LIST
+ \clist_set:Nx \l_ltj_adjust_priority {#1}
+ \ltj_adjust_inittable:
+ \clist_map_function:NN \l_ltj_adjust_priority \ltj_adjust_appendtable:n
+ }
+ \ExplSyntaxOff
+\fi
%%------------------ all done
\ltj@adjust@AtEnd
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
index b1a9b4aa5c0..597e53303ff 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,7 +3,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2013/08/17 fontspec support of LuaTeX-ja]
+\ProvidesPackage{luatexja-fontspec}[2014/01/23 fontspec support of LuaTeX-ja]
\RequirePackage{fontspec,luatexja}
\ExplSyntaxOn
@@ -174,38 +174,31 @@
%%%%%%%% Now we completely ignore kanjifont definition file.
\DeclareRobustCommand\fontfamily[1]{%
- \@notkfamfalse\@notffamfalse\edef\tmp@item{{#1}}%
+ \@notkfamfalse\@notffamfalse
+ \edef\tmp@item{'\luatexluaescapestring{#1}'}%
+ \edef\tmp@enc{'\luatexluaescapestring{\f@encoding}'}%
\ifcsname \k@encoding+#1\endcsname % if \k@encoding+#1 is already defined
\edef\k@family{#1}%
- \else
- \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\k@encoding+%
- \@notkfamtrue
- \fi
+ \else\@notkfamtrue\fi
\ifcsname \f@encoding+#1\endcsname
\edef\f@family{#1}%
\else % search font definition file...
- \ifcsname ffam@list@\f@encoding\endcsname\else
- \expandafter\gdef\csname ffam@list@\f@encoding\endcsname{}%
- \expandafter\gdef\csname notffam@list@\f@encoding\endcsname{}%
- \fi
- \edef\@templist{\@nameuse{ffam@list@\f@encoding}}%
- \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
- \ifin@\edef\f@family{#1}\else
- \edef\@templist{\@nameuse{notffam@list@\f@encoding}}%
- \expandafter\expandafter\expandafter\inlist@\expandafter\tmp@item\expandafter{\@templist}%
- \ifin@\@notffamtrue\else
- \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
- \message{(I search font definition file. \@@temp)}%
- \IfFileExists{\@@temp}{\@tempswztrue}{\@tempswzfalse}%
- \if@tempswz
- \expandafter\xdef\csname ffam@list@\f@encoding\endcsname
- {\@nameuse{ffam@list@\f@encoding}\fam@elt<#1>}\edef\f@family{#1}%
- \else
- \expandafter\xdef\csname notffam@list@\f@encoding\endcsname
- {\@nameuse{notffam@list@\f@encoding}\fam@elt<#1>}\@notffamtrue%
- \fi
- \fi
- \fi
+ \directlua{luatexja.jfont.is_ffam(\tmp@enc, \tmp@item)}%
+ \ifin@\edef\k@family{#1}\else%
+ \directlua{luatexja.jfont.is_Nffam(\tmp@enc, \tmp@item)}%
+ \ifin@\@notffamtrue\else%
+ \def\@temp##1+{\lowercase{\def\@@temp{##1#1.fd}}}\expandafter\@temp\f@encoding+%
+ \message{(I search kanjifont definition file: \@@temp)}%
+ \IfFileExists{\@@temp#1.fd}{\@tempswztrue}{\@tempswzfalse}%
+ \if@tempswz
+ \directlua{luatexja.jfont.add_ffam_list(\tmp@enc, \tmp@item)}%
+ \edef\f@family{#1}%
+ \else
+ \directlua{luatexja.jfont.add_Nffam_list(\tmp@enc, \tmp@item)}%
+ \@notffamtrue%
+ \fi
+ \fi
+ \fi
\fi
\if@notkfam\if@notffam
{\ifcsname D@\k@encoding\endcsname\@nameuse{D@\k@encoding}\fi
@@ -219,17 +212,12 @@
\def\try@load@fontshape{%
\expandafter
\ifx\csname \f@encoding+\f@family\endcsname\relax
- \edef\tmp@item{{\directlua{%
- tex.print(luatexbase.catcodetables["latex-package"], '\f@encoding')}%
- }}% \f@encoding の展開結果の catcode は 12 であるため,これで補正.
- \expandafter\expandafter\expandafter
- \inlist@\expandafter\tmp@item\expandafter{\kenc@list}%
+ \directlua{luatexja.jfont.is_kenc('\luatexluaescapestring{\f@encoding}')}%
\ifin@ % Japanese font: we don't search fd.
\@font@warning{We don't search kanjifont definition
\MessageBreak for \f@encoding/\f@family}%
\else % Alphabetic font
- \@font@info{Try loading font information for
- \f@encoding+\f@family}%
+ \@font@info{Try loading font information for \f@encoding+\f@family}%
\global\expandafter\let
\csname\f@encoding+\f@family\endcsname\@empty
\nfss@catcodes