summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexja/addons
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-10 01:31:19 +0000
committerKarl Berry <karl@freefriends.org>2012-12-10 01:31:19 +0000
commiteb3f5f9a64a4553a16273f9ff5cfe99d10f27dd8 (patch)
tree5e47c27e88cdb655ee7fefcf919ab531e8a4b757 /Master/texmf-dist/tex/luatex/luatexja/addons
parent64b7e39503022a8c0ce58857cea7f25d57369757 (diff)
luatexja (9dec12)
git-svn-id: svn://tug.org/texlive/trunk@28482 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.sty119
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty17
-rw-r--r--Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty9
3 files changed, 135 insertions, 10 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
new file mode 100644
index 00000000000..21404ec1456
--- /dev/null
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-adjust.sty
@@ -0,0 +1,119 @@
+%
+% luatexja-adjust.sty
+%
+
+%% Avoid multiple loading.
+\csname\if11luatexjaadjustLoaded\fi\endcsname
+\edef\x{%
+\catcode32=\the\catcode32%
+\catcode33=\the\catcode33%
+\catcode35=\the\catcode35%
+\catcode40=\the\catcode40%
+\catcode41=\the\catcode41%
+\catcode42=\the\catcode42%
+\catcode43=\the\catcode43%
+\catcode44=\the\catcode44%
+\catcode45=\the\catcode45%
+\catcode46=\the\catcode46%
+\catcode58=\the\catcode58%
+\catcode59=\the\catcode59%
+\catcode60=\the\catcode60%
+\catcode61=\the\catcode61%
+\catcode62=\the\catcode62%
+\catcode64=\the\catcode64%
+\catcode91=\the\catcode91%
+\catcode93=\the\catcode93%
+\catcode94=\the\catcode94%
+\catcode95=\the\catcode95%
+\catcode126=\the\catcode126%
+\endlinechar=\the\endlinechar
+\relax}
+\catcode32=10 %< >
+\catcode33=12 %<">
+\catcode35=6 %<#>
+\catcode40=12 %<(>
+\catcode41=12 %<)>
+\catcode42=12 %<*>
+\catcode43=12 %<+>
+\catcode44=12 %<,>
+\catcode45=12 %<->
+\catcode46=12 %<.>
+\catcode58=12 %<:>
+\catcode59=12 %<;>
+\catcode60=12 %<<>
+\catcode61=12 %<=>
+\catcode62=12 %<>>
+\catcode64=11 %<@>
+\catcode91=12 %<[>
+\catcode93=12 %<]>
+\catcode94=7 %<^>
+\catcode95=8 %<_>
+\catcode126=13 %<~>
+\endlinechar=-1 %
+
+\edef\ltj@adjust@AtEnd{\x
+ \noexpand\let\noexpand\ltj@adjust@AtEnd\relax}
+\def\luatexjaadjustLoaded{\endinput}
+
+%% Check if LaTeX is used.
+\begingroup\expandafter\expandafter\expandafter\endgroup
+\expandafter\ifx\csname RequirePackage\endcsname\relax %<*!LaTeX>
+ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
+ \csname iffalse\endcsname
+\else %<*LaTeX>
+ \expandafter\let\csname ifltj@in@latex\expandafter\endcsname
+ \csname iftrue\endcsname
+ \NeedsTeXFormat{LaTeX2e}
+ \ProvidesPackage{luatexja-adjust}[2012/10/01 v0.1]
+\fi %</LaTeX>
+
+% Load core module if not yet.
+\ifx\luatexjacoreLoaded\@undefined
+ \ifltj@in@latex %<*LaTeX>
+ \RequirePackage{luatexja}[2012/04/20]
+ \else %<*!LaTeX>
+ \input luatexja.sty %
+ \fi %</LaTeX>
+\fi
+
+%% When environment check fails, exit now.
+\ifx\LuaTeXjaAvailable\@undefined
+ \ltj@otf@AtEnd
+\expandafter\endinput\fi\relax
+
+%%------------------
+\RequirePackage{expl3}
+%! Main part of luatexja-adjust
+\RequireLuaTeXjaSubmodule{adjust}
+
+% enable/disable ``advanced'' line adjustment
+\protected\def\ltjdisableadjust{\directlua{luatexja.adjust.disable_cb()}}
+\protected\def\ltjenableadjust{\directlua{luatexja.adjust.enable_cb()}}
+\ltjenableadjust
+% there is also a key for \ltjsetparameter, for same effect
+\define@boolkey[ltj]{japaram}{adjust}[true]{%
+ \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
+
+
+%%------------------ all done
+\ltj@adjust@AtEnd
+\endinput
+%% EOF
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 b37b08f6c0b..4a037d640cd 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-fontspec.sty
@@ -3,12 +3,12 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{luatexja-fontspec}[2011/09/23 v0.2]
+\ProvidesPackage{luatexja-fontspec}[2012/09/17 v0.2a]
\RequirePackage{fontspec,luatexja}
-
\ExplSyntaxOn
+%%%%%%%% Messages
\cs_new:Npn \ltj_fontspec_warning:n { \msg_warning:nn {ltj-fontspec} }
\msg_new:nnn {ltj-fontspec} {addjfontfeatures-ignored}
@@ -19,12 +19,22 @@
\cs_generate_variant:Nn \prg_new_conditional:Nnn {Nnx}
+%%%%%%%% For compatibility with old fontspec.
\prg_new_conditional:Nnx \ltj_fontspec_if_liiikeys: {TF,F} {
\@ifpackagelater {fontspec} {2011/09/13}
{ \exp_not:N \prg_return_true: } % fontspec >= 2.2 (l3keys)
{ \exp_not:N \prg_return_false: } % fontspec < 2.2 (xkeyval)
}
+%%%%%%%% \g_ltj_fontspec_scale_fp
+%% Default scale value for jfont.
+\group_begin:
+\fontsize{10}{10}\selectfont
+\fp_gset:Nn \g_ltj_fontspec_scale_fp {\zw / 10}
+\group_end:
+
+%%%%%%%% Internal control sequences
+%% Each CS is ltj_fontspec version that corresponds to original CS of fontspec.
\cs_new:Nn \ltj_fontspec_define_option:nn {
\ltj_fontspec_if_liiikeys:TF {
\keys_define:nn {fontspec} { #1 .code:n = {#2}}
@@ -70,7 +80,7 @@
\tl_set:Nn \zf@enc {JY3}
}
\tl_set:Nx \g_fontspec_default_fontopts_tl
- {JFM=ujis,Scale=0.962216,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
+ {JFM=ujis,Scale=\fp_use:N \g_ltj_fontspec_scale_fp,Kerning=Off,\g_ltj_fontspec_default_fontopts_tl}
\cs_set_eq:NN \DeclareFontFamily \DeclareKanjiFamily
\fontspec_select:nn{#1}{#2}
\group_end:
@@ -84,6 +94,7 @@
\tl_set_eq:NN #1 \l_fontspec_family_tl
}
+%%%%%%%% User commands
\DeclareDocumentCommand \jfontspec { O{} m } {
\ltj_fontspec_set_family:Nnn \k@family {#1}{#2}
\selectfont
diff --git a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
index d4fd53bbfc9..61983d57cbf 100644
--- a/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
+++ b/Master/texmf-dist/tex/luatex/luatexja/addons/luatexja-preset.sty
@@ -1,6 +1,6 @@
% luatexja-preset.sty
\ProvidesPackage{luatexja-preset}
- [2012/05/18 v0.0]
+ [2012/09/17 v0.1]
\RequirePackage{expl3}
\RequirePackage{luatexja-fontspec}
@@ -25,12 +25,8 @@
\DeclareOption{nodeluxe}{\int_set:Nn \l_ltjpreset_deluxe_int { 0 }} % 2 fonts
% scale
-{ \fontsize{1024}{1024}\selectfont
- \fp_set_from_dim:Nn \l_ltjpreset_scale_fp \zw
- \fp_gdiv:Nn \l_ltjpreset_scale_fp {1024}
-}
\msg_new:nnn { luatexja-preset }{ scale }{
- 日本語フォントは~\fp_use:N \l_ltjpreset_scale_fp~倍にスケーリングされます.
+ 日本語フォントは~\fp_use:N \g_ltj_fontspec_scale_fp~倍にスケーリングされます.
}
\msg_warning:nn { luatexja-preset }{ scale }
@@ -227,7 +223,6 @@
\tl_new:N \l_ltjpreset_add_features_tl
\tl_set:Nx \l_ltjpreset_add_features_tl {
- Scale = \fp_use:N \l_ltjpreset_scale_fp ,
\tl_use:N \l_ltjpreset_kanji_shape_tl,
JFM = \ltjpreset_use_jfm:
}